summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2014-10-06 06:58:55 (GMT)
committerMontel Laurent <montel@kde.org>2014-10-06 06:58:55 (GMT)
commit67614e453f653fed67fee01e4f96b7903cd4694a (patch)
tree1a161760f607cac658c111c9ffb01068ec9a821c
parent26fc592e7db0518fa70fd39c3e620847b62c1c32 (diff)
Minor
-rw-r--r--CMakeLists.txt4
-rw-r--r--generators/dvi/pageSize.cpp1
2 files changed, 2 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8953d5b..e9a8f14 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -167,7 +167,7 @@ ki18n_wrap_ui(okularcore_SRCS
kconfig_add_kcfg_files(okularcore_SRCS conf/settings_core.kcfgc )
-kde4_add_library(okularcore SHARED ${okularcore_SRCS})
+add_library(okularcore SHARED ${okularcore_SRCS})
# Special handling for linking okularcore on OSX/Apple
IF(APPLE)
@@ -265,7 +265,7 @@ ki18n_wrap_ui(okularpart_SRCS
kconfig_add_kcfg_files(okularpart_SRCS conf/settings.kcfgc )
message("KF5: Enable ui/tts.cpp again")
-#qt4_add_dbus_interfaces(okularpart_SRCS ${KDE4_DBUS_INTERFACES_DIR}/org.kde.KSpeech.xml)
+#qt5_add_dbus_interfaces(okularpart_SRCS ${KDE4_DBUS_INTERFACES_DIR}/org.kde.KSpeech.xml)
add_library(okularpart MODULE ${okularpart_SRCS})
diff --git a/generators/dvi/pageSize.cpp b/generators/dvi/pageSize.cpp
index 3a98e29..c15fb62 100644
--- a/generators/dvi/pageSize.cpp
+++ b/generators/dvi/pageSize.cpp
@@ -360,5 +360,4 @@ int pageSize::defaultPageSize()
return defaultImperialPaperSize;
}
-#include "pageSize.moc"