[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kolor-manager/frameworks] /: port kmdevices to KF5
From: Kai-Uwe Behrmann <ku.b () gmx ! de>
Date: 2015-05-08 20:40:04
Message-ID: E1Yqp40-0000Rh-74 () scm ! kde ! org
[Download RAW message or body]
Git commit 03ae187de923d6705412aefc315cb88ed9eb785a by Kai-Uwe Behrmann.
Committed on 08/05/2015 at 20:08.
Pushed by behrmann into branch 'frameworks'.
port kmdevices to KF5
kolor-server is ported separately to KF5
kminfo and kmsettings will follow later
#include "kmdevices.moc" fixes some missed vtable compile errors
There is not alternative KDE4 possible like in Synnefo.
M +17 -8 CMakeLists.txt
M +13 -10 devices/CMakeLists.txt
M +26 -18 devices/kmdevices.cpp
http://commits.kde.org/kolor-manager/03ae187de923d6705412aefc315cb88ed9eb785a
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e0fe5df..d93b96a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,6 @@ SET( PACKAGE_NAME kolor-manager )
SET( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake/modules )
-CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
# project version
SET( ${PROJECT_NAME}_MAJOR_VERSION 1)
@@ -14,11 +13,21 @@ SET( ${PROJECT_NAME}_MICRO_VERSION 0)
SET( ${PROJECT_NAME}_VERSION \
${${PROJECT_NAME}_MAJOR_VERSION}.${${PROJECT_NAME}_MINOR_VERSION}.${${PROJECT_NAME}_MICRO_VERSION} \
)
-FIND_PACKAGE(KDE4 REQUIRED )
+FIND_PACKAGE(Qt5Widgets)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0)
+FIND_PACKAGE(ECM REQUIRED NO_MODULE)
+SET(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_MODULE_PATH})
+INCLUDE(KDEInstallDirs)
+INCLUDE(KDECompilerSettings)
+INCLUDE(KDECMakeSettings)
+INCLUDE(FeatureSummary)
+INCLUDE(GenerateExportHeader)
+
+FIND_PACKAGE(Qt5 REQUIRED COMPONENTS Core Widgets)
+FIND_PACKAGE(KF5 REQUIRED COMPONENTS CoreAddons I18n ConfigWidgets KDELibs4Support \
ConfigWidgets) +
FIND_PACKAGE(Oyranos REQUIRED)
-FIND_PACKAGE(Xcm REQUIRED) # for KolorServer
FIND_PACKAGE(Synnefo REQUIRED)
-FIND_PACKAGE(Qt REQUIRED )
INCLUDE_DIRECTORIES(${KDE4_INCLUDES} ${OYRANOS_INCLUDE_DIRS} ${XCM_INCLUDE_DIRS} \
${SYNNEFO_INCLUDE_DIR}) @@ -31,12 +40,12 @@ LINK_DIRECTORIES(
SET( ${CMAKE_BUILD_TYPE} Debug)
-SUBDIRS(devices kolor-server information settings)
+SUBDIRS( devices
+ #information
+ #settings
+ )
-#kde4_add_plugin(settings-kolor-management ${kolor-manager_PART_SRCS})
-
-#install(TARGETS kmdevices DESTINATION /usr/lib64/kde4)
INSTALL( FILES settings-kolor-management.desktop DESTINATION \
${SERVICES_INSTALL_DIR} )
ADD_CUSTOM_TARGET( dist
diff --git a/devices/CMakeLists.txt b/devices/CMakeLists.txt
index ef386c1..38c6ec9 100644
--- a/devices/CMakeLists.txt
+++ b/devices/CMakeLists.txt
@@ -1,19 +1,22 @@
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
-INCLUDE( ${QT_USE_FILE} )
-set(kmdevices_PART_SRCS
+SET(kmdevices_PART_SRCS
kmdevices.cpp
)
-set(kmdevices_RCCS
+SET(kmdevices_RCCS
icons.qrc
)
-QT4_ADD_RESOURCES(kmdevices_RCC_SRCS ${kmdevices_RCCS})
+QT5_ADD_RESOURCES(kmdevices_RCC_SRCS ${kmdevices_RCCS})
+ADD_LIBRARY( kmdevices MODULE ${kmdevices_PART_SRCS} ${kmdevices_RCC_SRCS})
+TARGET_LINK_LIBRARIES( kmdevices
+ KF5::CoreAddons
+ KF5::ConfigWidgets
+ KF5::I18n
+ ${SYNNEFO_LIBRARIES}
+ Qt5::Core
+ Qt5::Widgets )
-kde4_add_plugin(kmdevices ${kmdevices_PART_SRCS} ${kmdevices_RCC_SRCS})
-
-target_link_libraries(kmdevices ${SYNNEFO_LIBRARIES} ${KDE4_KDEUI_LIBS} \
${QT_LIBRARIES} )
-
-install(TARGETS kmdevices DESTINATION ${PLUGIN_INSTALL_DIR})
-install( FILES kmdevices.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+INSTALL( TARGETS kmdevices DESTINATION ${PLUGIN_INSTALL_DIR})
+INSTALL( FILES kmdevices.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
diff --git a/devices/kmdevices.cpp b/devices/kmdevices.cpp
index 10371cd..47e8630 100644
--- a/devices/kmdevices.cpp
+++ b/devices/kmdevices.cpp
@@ -26,8 +26,10 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "kmdevices.h"
-#include <KGenericFactory>
-#include <KAboutData>
+#include <kcmodule.h>
+#include <kaboutdata.h>
+#include <KLocalizedString>
+#include <kpluginfactory.h>
#include <oyranos.h> // oyMessageFuncSet()
@@ -36,24 +38,29 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
K_PLUGIN_FACTORY( kmdevicesFactory,
registerPlugin<kmdevices>();
)
-K_EXPORT_PLUGIN( kmdevicesFactory("kmdevices") )
-kmdevices::kmdevices(QWidget *parent, const QVariantList &) :
- KCModule( kmdevicesFactory::componentData(), parent)
+kmdevices::kmdevices(QWidget *parent, const QVariantList &args ) :
+ KCModule( parent, args )
{
- KAboutData* about = new KAboutData(
- "kmdevices", 0, ki18n("KMDevices"), 0, KLocalizedString(),
- KAboutData::License_BSD,
- ki18n("(c) 2008 Joseph Simon III")
- );
- about->addAuthor( ki18n("2008-2009 Joseph Simon III"), KLocalizedString(),
- "j.simon.iii@astound.net" );
- about->addAuthor( ki18n("2010-2014 Kai-Uwe Behrmann"), KLocalizedString(),
- "ku.b@gmx.de" );
- about->addAuthor( ki18n("2012 Jan Gruhlich"), KLocalizedString(),
- "ku.b@gmx.de" );
-
- setAboutData( about );
+ KAboutData about("kmdevices", i18n("KMDevices"), "1.0.2",
+ i18n("KDE version of Synnefo"),
+ KAboutLicense::BSDL,
+ i18n("(c) 2008 Joseph Simon III"));
+
+ about.addAuthor(i18n("Joseph Simon III"), i18n("developer"), \
"j.simon.iii@astound.net", 0); + about.addAuthor(i18n("Kai-Uwe Behrmann"), \
i18n("developer"), "ku.b@gmx.de", 0); + about.addAuthor(i18n("Jan Gruhlich"), \
i18n("developer"), "jgrulich@redhat.com", 0); +
+ about.addAuthor(i18n("Albert Astals Cid"), i18n("developer"), \
"tsdgeos@terra.es", 0); + about.addAuthor(i18n("Christoph Feck"), \
i18n("developer"), "christoph@maxiom.de", 0); + about.addAuthor(i18n("Boudewijn \
Rempt "), i18n("developer"), "boud@valdyas.org", 0); + about.addAuthor(i18n("Pino \
Toscano"), i18n("developer"), "pino@kde.org", 0); + about.addAuthor(i18n("Laurent \
Montel"), i18n("developer"), "montel@kde.org", 0); + about.addAuthor(i18n("Cyrille \
Berger Skott"), i18n("developer"), "cberger@cberger.net", 0); + \
about.addAuthor(i18n("Hal Van Engel"), i18n("developer"), "hvengel@gmail.com", 0); +
+ QList<KAboutPerson> people = about.authors();
+ about.addCredit(people[0].name(), people[0].task());
oyMessageFuncSet( oyGuiMessageFunc );
@@ -71,3 +78,4 @@ kmdevices::~kmdevices()
delete devicesModule;
}
+#include "kmdevices.moc"
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic