summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2014-11-19 13:27:59 +0100
committerMontel Laurent <[email protected]>2014-11-19 13:27:59 +0100
commitbb9111ea0576ff111379782422fc90fbebff1503 (patch)
tree71c2895b492027fd471353397e023bbf9bd66ddc
parent85a493d7e119963a6c8f41b140a13587e049c0e1 (diff)
Minor
-rw-r--r--tests/CMakeLists.txt12
-rw-r--r--tests/kipiimagecollectionselector.cpp2
-rw-r--r--tests/kipiinterface.cpp2
-rw-r--r--tests/kipisetup.cpp2
-rw-r--r--tests/kipitestmainwindow.cpp2
-rw-r--r--tests/kipitestpluginloader.cpp2
-rw-r--r--tests/kipiuploadwidget.cpp2
-rw-r--r--tests/kxmlhelloworld/CMakeLists.txt2
-rw-r--r--tests/kxmlhelloworld/plugin/plugin_kxmlhelloworld.cpp2
9 files changed, 14 insertions, 14 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 56be0d3..3330fe2 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -4,8 +4,8 @@
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-include_directories(${CMAKE_CURRENT_BINARY_DIR}/../libkipi
- ${CMAKE_CURRENT_SOURCE_DIR}/../libkipi
+include_directories(${CMAKE_CURRENT_BINARY_DIR}/../src
+ ${CMAKE_CURRENT_SOURCE_DIR}/../src
)
set(kxmlkipicmd_SRCS
@@ -20,13 +20,13 @@ set(kxmlkipicmd_SRCS
main.cpp
)
-KDE4_ADD_EXECUTABLE(kxmlkipicmd ${kxmlkipicmd_SRCS})
+add_executable(kxmlkipicmd ${kxmlkipicmd_SRCS})
target_link_libraries(kxmlkipicmd
kipi
- ${QT_QTGUI_LIBRARY}
- ${KDE4_UI_LIBS}
- ${KDE4_KPARTS_LIBS}
+ Qt5::Gui
+ KF5::KDELibs4Support
+ KF5::Parts
)
add_subdirectory(kxmlhelloworld)
diff --git a/tests/kipiimagecollectionselector.cpp b/tests/kipiimagecollectionselector.cpp
index 2e66d70..b81bf47 100644
--- a/tests/kipiimagecollectionselector.cpp
+++ b/tests/kipiimagecollectionselector.cpp
@@ -22,7 +22,7 @@
*
* ============================================================ */
-#include "kipiimagecollectionselector.moc"
+
// Qt includes:
diff --git a/tests/kipiinterface.cpp b/tests/kipiinterface.cpp
index 9026bcb..6eef923 100644
--- a/tests/kipiinterface.cpp
+++ b/tests/kipiinterface.cpp
@@ -24,7 +24,7 @@
*
* ============================================================ */
-#include "kipiinterface.moc"
+
// Qt includes
diff --git a/tests/kipisetup.cpp b/tests/kipisetup.cpp
index f532d7e..dddb81a 100644
--- a/tests/kipisetup.cpp
+++ b/tests/kipisetup.cpp
@@ -22,7 +22,7 @@
*
* ============================================================ */
-#include "kipisetup.moc"
+
// Qt includes
diff --git a/tests/kipitestmainwindow.cpp b/tests/kipitestmainwindow.cpp
index fcdb84b..c5c9939 100644
--- a/tests/kipitestmainwindow.cpp
+++ b/tests/kipitestmainwindow.cpp
@@ -22,7 +22,7 @@
*
* ============================================================ */
-#include "kipitestmainwindow.moc"
+
// Qt includes
diff --git a/tests/kipitestpluginloader.cpp b/tests/kipitestpluginloader.cpp
index ca92444..be35fff 100644
--- a/tests/kipitestpluginloader.cpp
+++ b/tests/kipitestpluginloader.cpp
@@ -22,7 +22,7 @@
*
* ============================================================ */
-#include "kipitestpluginloader.moc"
+
// Qt includes
diff --git a/tests/kipiuploadwidget.cpp b/tests/kipiuploadwidget.cpp
index 28703e6..27c8265 100644
--- a/tests/kipiuploadwidget.cpp
+++ b/tests/kipiuploadwidget.cpp
@@ -22,7 +22,7 @@
*
* ============================================================ */
-#include "kipiuploadwidget.moc"
+
// Qt includes:
diff --git a/tests/kxmlhelloworld/CMakeLists.txt b/tests/kxmlhelloworld/CMakeLists.txt
index d28ad0c..f18e3e2 100644
--- a/tests/kxmlhelloworld/CMakeLists.txt
+++ b/tests/kxmlhelloworld/CMakeLists.txt
@@ -17,7 +17,7 @@ set(kipiplugin_kxmlhelloworld_PART_SRCS
KDE4_ADD_PLUGIN(kipiplugin_kxmlhelloworld ${kipiplugin_kxmlhelloworld_PART_SRCS})
target_link_libraries(kipiplugin_kxmlhelloworld
- ${KDE4_KPARTS_LIBS}
+ KF5::Parts
${QT_AND_KDECORE_LIBS}
${KIPI_LIBRARIES}
kipi
diff --git a/tests/kxmlhelloworld/plugin/plugin_kxmlhelloworld.cpp b/tests/kxmlhelloworld/plugin/plugin_kxmlhelloworld.cpp
index 3f48143..0d4ccce 100644
--- a/tests/kxmlhelloworld/plugin/plugin_kxmlhelloworld.cpp
+++ b/tests/kxmlhelloworld/plugin/plugin_kxmlhelloworld.cpp
@@ -35,7 +35,7 @@
*/
/// No need to include plugin_helloworld.h, it will be done through Qt moc file.
-#include "plugin_kxmlhelloworld.moc"
+
// Qt includes