From c9c4e6c3b260f42dcdc76b5a3b3fc15cbceeee22 Mon Sep 17 00:00:00 2001 From: Michael Palimaka Date: Tue, 18 Feb 2014 02:36:56 +1100 Subject: [PATCH] Remove unused system dependencies. - plasma_appletscript_declarative includes QtUiTools but doesn't use it - QtPrintSupport is not used anywhere - Xss, Xext, and SM are not used anywhere - OpenSSL is not used anywhere REVIEW: 115830 --- CMakeLists.txt | 23 ++----------------- src/plasma/CMakeLists.txt | 1 - src/scriptengines/qml/CMakeLists.txt | 1 - .../qml/plasmoid/declarativeappletscript.cpp | 1 - 4 files changed, 2 insertions(+), 24 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e80978e68..084fd6d25 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,7 +38,7 @@ endif() set (QT_MIN_VERSION "5.2.0") set(KF5_VERSION "4.96.0") -find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Quick Sql UiTools Qml Widgets Svg Declarative Script Test PrintSupport) +find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Quick Sql Qml Widgets Svg Declarative Script Test) find_package(KF5Activities ${KF5_VERSION} REQUIRED) find_package(KF5Archive ${KF5_VERSION} REQUIRED) @@ -92,28 +92,9 @@ if(X11_FOUND AND XCB_XCB_FOUND) set(HAVE_X11 1) find_package(Qt5 REQUIRED NO_MODULE COMPONENTS X11Extras) #X11_Xrender discovery is done by FindX11 - add_feature_info("X Rendering Extension (libXrender)" X11_Xrender_FOUND "Support for compositing, rendering operations, and alpha-blending. STRONGLY RECOMMENDED") - add_feature_info("X Screensaver Extension (libXss)" X11_Xscreensaver_FOUND "Support for KIdleTime (fallback mode)") - add_feature_info("X Sync Extension (libXext)" X11_XSync_FOUND "Efficient operation of KIdleTime. STRONGLY RECOMMENDED") - - if(NOT X11_XSync_FOUND AND NOT X11_Xscreensaver_FOUND) - message(FATAL_ERROR "\nNeither the XSync (libXext) nor XScreensaver (libXss) development package was found.\nPlease install one of them (XSync is recommended)\n") - endif() - - #X11 Session Management (SM) is required - #X11_SM_FOUND is set in FindX11, which is required by KDE4Internal - if(UNIX AND NOT X11_SM_FOUND) - message(FATAL_ERROR "\nThe X11 Session Management (SM) development package could not be found.\nPlease install libSM.\n") - endif() + #add_feature_info("X Rendering Extension (libXrender)" X11_Xrender_FOUND "Support for compositing, rendering operations, and alpha-blending. STRONGLY RECOMMENDED") endif() -find_package(OpenSSL MODULE) -set_package_properties(OpenSSL PROPERTIES DESCRIPTION "Support for secure network communications (SSL and TLS)" - URL "http://openssl.org" - TYPE RECOMMENDED - PURPOSE "KDE uses OpenSSL for the bulk of secure communications, including secure web browsing via HTTPS" - ) - #FIXME: when we have a qca for qt5, reenable # find_package(QCA2 2.0.0 MODULE) set_package_properties(QCA2 PROPERTIES DESCRIPTION "Support for remote plasma widgets" diff --git a/src/plasma/CMakeLists.txt b/src/plasma/CMakeLists.txt index ef886c82b..e0f6775d1 100644 --- a/src/plasma/CMakeLists.txt +++ b/src/plasma/CMakeLists.txt @@ -124,7 +124,6 @@ PRIVATE Qt5::Quick # needed in service.cpp, remove? Qt5::Svg Qt5::DBus - Qt5::UiTools Qt5::Xml KF5::Archive KF5::GuiAddons diff --git a/src/scriptengines/qml/CMakeLists.txt b/src/scriptengines/qml/CMakeLists.txt index 5c121dd99..428c3b457 100644 --- a/src/scriptengines/qml/CMakeLists.txt +++ b/src/scriptengines/qml/CMakeLists.txt @@ -23,7 +23,6 @@ target_link_libraries(plasma_appletscript_declarative Qt5::Quick Qt5::Qml Qt5::Script - Qt5::UiTools KF5::Activities KF5::KIOCore KF5::KIOWidgets diff --git a/src/scriptengines/qml/plasmoid/declarativeappletscript.cpp b/src/scriptengines/qml/plasmoid/declarativeappletscript.cpp index ab9cd856d..5126b4487 100644 --- a/src/scriptengines/qml/plasmoid/declarativeappletscript.cpp +++ b/src/scriptengines/qml/plasmoid/declarativeappletscript.cpp @@ -25,7 +25,6 @@ #include #include #include -#include #include #include