summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Caulier <[email protected]>2014-11-27 18:45:27 +0100
committerGilles Caulier <[email protected]>2014-11-27 18:45:27 +0100
commit6d34b06c0a94be64433f3077ed8cb47a6cc47d33 (patch)
treed1ab66739fa8ce9ee0c2773c424cb1c0e7c81e15
parent0d12488ff454f0529508648ca7073e35d4685488 (diff)
port++
-rw-r--r--pics/CMakeLists.txt14
-rw-r--r--tests/CMakeLists.txt8
-rw-r--r--tests/kipicmd/main.cpp2
-rw-r--r--tests/kxmlkipicmd/main.cpp24
4 files changed, 27 insertions, 21 deletions
diff --git a/pics/CMakeLists.txt b/pics/CMakeLists.txt
index c75cba4..d6e0a84 100644
--- a/pics/CMakeLists.txt
+++ b/pics/CMakeLists.txt
@@ -4,10 +4,18 @@
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-ecm_install_icons(ICONS hi128-apps-kipi.png hi16-apps-kipi.png hi22-apps-kipi.png hi32-apps-kipi.png hi48-apps-kipi.png DESTINATION ${ICON_INSTALL_DIR})
+ecm_install_icons(ICONS hi128-apps-kipi.png
+ hi16-apps-kipi.png
+ hi22-apps-kipi.png
+ hi32-apps-kipi.png
+ hi48-apps-kipi.png
+ DESTINATION
+ ${ICON_INSTALL_DIR}
+)
install(FILES kipi-plugins_logo.png
kipi-icon.svg
kipi-logo.svg
- DESTINATION ${DATA_INSTALL_DIR}/kipi/data)
-
+ DESTINATION
+ ${DATA_INSTALL_DIR}/kipi/data
+)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 1fc2dc2..3bd7a14 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -43,8 +43,6 @@ install(FILES kxmlkipicmd/kxmlkipicmd_gwenviewui.rc DESTINATION ${DATA_INSTALL
#----------------------------------------------------------------------------------------------------
-#add_definitions(${KEXIV2_DEFINITIONS})
-
set(kipicmd_SRCS
common/kipiinterface.cpp
common/kipiimagecollectionshared.cpp
@@ -52,13 +50,13 @@ set(kipicmd_SRCS
common/kipiimagecollectionselector.cpp
common/kipiuploadwidget.cpp
kipicmd/main.cpp
- )
+)
-KDE4_ADD_EXECUTABLE(kipicmd ${kipicmd_SRCS})
+add_executable(kipicmd ${kipicmd_SRCS})
target_link_libraries(kipicmd
Qt5::Gui
KF5::KDELibs4Support
KF5::Parts
KF5Kipi
- )
+)
diff --git a/tests/kipicmd/main.cpp b/tests/kipicmd/main.cpp
index 19315a9..f27d1cf 100644
--- a/tests/kipicmd/main.cpp
+++ b/tests/kipicmd/main.cpp
@@ -123,7 +123,7 @@ QList<QPair<int, QAction*> > FlattenActionList(const QList<QAction*>& actions, c
}
QMenu* const menu = (*it)->menu();
-
+
if (menu)
{
results.append( FlattenActionList(menu->actions(), level+1) );
diff --git a/tests/kxmlkipicmd/main.cpp b/tests/kxmlkipicmd/main.cpp
index ac8d365..70f0bcc 100644
--- a/tests/kxmlkipicmd/main.cpp
+++ b/tests/kxmlkipicmd/main.cpp
@@ -52,18 +52,18 @@ using namespace KXMLKipiCmd;
int main(int argc, char* argv[])
{
const K4AboutData aboutData("kxmlkipicmd",
- "kipi",
- ki18n("kxmlkipicmd"),
- KIPI_VERSION_STRING, // libkipi version
- ki18n("Kipi host test application using KDE XML-GUI"),
- K4AboutData::License_GPL,
- ki18n("(c) 2009-2010 Michael G. Hansen\n"
- "(c) 2011-2012 Gilles Caulier\n"
- "(c) 2012 Victor Dodon "),
- KLocalizedString(), // optional text
- "http://www.digikam.org", // URI of homepage
- "[email protected]" // bugs e-mail address
- );
+ "kipi",
+ ki18n("kxmlkipicmd"),
+ KIPI_VERSION_STRING, // libkipi version
+ ki18n("Kipi host test application using KDE XML-GUI"),
+ K4AboutData::License_GPL,
+ ki18n("(c) 2009-2010 Michael G. Hansen\n"
+ "(c) 2011-2014 Gilles Caulier\n"
+ "(c) 2012 Victor Dodon "),
+ KLocalizedString(), // optional text
+ "http://www.digikam.org", // URI of homepage
+ "[email protected]" // bugs e-mail address
+ );
KCmdLineArgs::init(argc, argv, &aboutData);
KCmdLineOptions options;