diff --git a/CMakeLists.txt b/CMakeLists.txt index 92b4eef..65d3c9b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,40 +1,40 @@ project(KScreen) set(PROJECT_VERSION "5.11.90") cmake_minimum_required(VERSION 2.8.12) set(KSCREEN_VERSION ${PROJECT_VERSION}) add_definitions("-DKSCREEN_VERSION=\"${KSCREEN_VERSION}\"") find_package(ECM 1.6.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) find_package(Qt5 REQUIRED COMPONENTS QuickWidgets Test) find_package(KF5 REQUIRED COMPONENTS DBusAddons Config ConfigWidgets I18n XmlGui GlobalAccel WidgetsAddons - Declarative IconThemes Plasma WindowSystem + Declarative IconThemes Plasma ) # WARNING PlasmaQuick provides unversioned CMake config find_package(KF5 REQUIRED COMPONENTS PlasmaQuick) set(MIN_LIBKSCREEN_VERSION "5.2.91") find_package(KF5Screen ${MIN_LIBKSCREEN_VERSION} REQUIRED) include(KDEInstallDirs) include(KDECompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) include(ECMInstallIcons) include(ECMMarkAsTest) include(FeatureSummary) include(ECMQtDeclareLoggingCategory) add_subdirectory(icons) add_subdirectory(kcm) #add_subdirectory(plasma) add_subdirectory(kded) add_subdirectory(tests) add_subdirectory(console) install( FILES kscreen.categories DESTINATION ${KDE_INSTALL_CONFDIR} ) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/tests/osd/CMakeLists.txt b/tests/osd/CMakeLists.txt index 51b2eb2..b7c5e9e 100644 --- a/tests/osd/CMakeLists.txt +++ b/tests/osd/CMakeLists.txt @@ -1,17 +1,20 @@ include_directories(${CMAKE_SOURCE_DIR}/kcm/src) -add_executable(osdtest main.cpp osdtest.cpp ../../kded/osd.cpp ../../kded/osdmanager.cpp ../../kcm/src/utils.cpp) +add_executable(osdtest main.cpp + osdtest.cpp + ../../kded/osd.cpp + ../../kded/osdmanager.cpp + ../../kcm/src/utils.cpp +) + target_link_libraries(osdtest Qt5::Core Qt5::DBus Qt5::Quick Qt5::Qml KF5::Screen - #KF5::PlasmaQuick KF5::I18n KF5::Declarative - #KF5::IconThemes - #KF5::QuickAddons ) add_test(kscreen-kded-osdtest osdtest) ecm_mark_as_test(osdtest) diff --git a/tests/osd/main.cpp b/tests/osd/main.cpp index d406ab4..a63151d 100644 --- a/tests/osd/main.cpp +++ b/tests/osd/main.cpp @@ -1,39 +1,35 @@ /************************************************************************************* * Copyright 2014-2016 by Sebastian Kügler * * * * This program is free software; you can redistribute it and/or * * modify it under the terms of the GNU General Public License * * as published by the Free Software Foundation; either version 2 * * of the License, or (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the Free Software * * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * *************************************************************************************/ #include "osdtest.h" #include #include int main(int argc, char **argv) { QGuiApplication app(argc, argv); KScreen::OsdTest osdtest; - - QCommandLineOption config = QCommandLineOption(QStringList() << QStringLiteral("c") << "config", - QStringLiteral("Config file"), "config"); QCommandLineParser parser; parser.addHelpOption(); - parser.addOption(config); parser.process(app); osdtest.start(); return app.exec(); }