diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 1f3dd63f..5042bbaf 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -1,39 +1,40 @@ include_directories( ToolTips ) set( systemsettings_SRCS SystemSettingsApp.cpp SettingsBase.cpp ToolTips/tooltipmanager.cpp main.cpp ) ecm_qt_declare_logging_category(systemsettings_SRCS HEADER systemsettings_app_debug.h IDENTIFIER SYSTEMSETTINGS_APP_LOG CATEGORY_NAME org.kde.systemsettings.app) # port it it's in kdelibs4support # kde4_add_app_icon( systemsettings_SRCS "${KDE4_ICON_INSTALL_DIR}/oxygen/*/categories/preferences-system.png" ) ki18n_wrap_ui( systemsettings_SRCS configDialog.ui ) kconfig_add_kcfg_files( systemsettings_SRCS BaseConfig.kcfgc ) qt5_add_dbus_adaptor( systemsettings_SRCS org.kde.systemsettings.xml SystemSettingsApp.h SystemSettingsApp ) add_executable( systemsettings5 ${systemsettings_SRCS}) target_compile_definitions(systemsettings5 PRIVATE -DPROJECT_VERSION="${PROJECT_VERSION}") target_link_libraries( systemsettings5 systemsettingsview KF5::Crash KF5::ItemViews KF5::KCMUtils KF5::I18n KF5::IconThemes KF5::KIOWidgets KF5::Service KF5::WindowSystem KF5::XmlGui KF5::DBusAddons KF5::ConfigGui + KF5::QuickAddons PW::KWorkspace ) install( TARGETS systemsettings5 ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} ) install( FILES systemsettings.kcfg DESTINATION ${KDE_INSTALL_DATADIR}/systemsettings ) install( FILES systemsettingsui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/systemsettings ) install( PROGRAMS kdesystemsettings.desktop systemsettings.desktop DESTINATION ${KDE_INSTALL_APPDIR} ) diff --git a/app/main.cpp b/app/main.cpp index f386f58f..ae0bbc35 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -1,72 +1,74 @@ /** * Copyright (C) 2009 Ben Cooksley * * This file was sourced from the System Settings package * Copyright (C) 2005 Benjamin C Meyer * * * 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 library 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 * Library General Public License for more details. * * You should have received a copy of the GNU Library General Public License * along with this library; see the file COPYING.LIB. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. */ #include #include #include #include +#include #include "SystemSettingsApp.h" #include "SettingsBase.h" int main( int argc, char *argv[] ) { //exec is systemsettings5, but we need the QPT to use the right config from the qApp constructor //which is before KAboutData::setApplicationData QCoreApplication::setApplicationName(QStringLiteral("systemsettings")); KWorkSpace::detectPlatform(argc, argv); + KQuickAddons::QtQuickSettings::init(); SystemSettingsApp application(argc, argv); KCrash::initialize(); KLocalizedString::setApplicationDomain("systemsettings"); // About data KAboutData aboutData(QStringLiteral("systemsettings"), i18n("System Settings"), QString::fromLatin1(PROJECT_VERSION), i18n("Central configuration center by KDE."), KAboutLicense::GPL, i18n("(c) 2009, Ben Cooksley")); aboutData.addAuthor(i18n("Ben Cooksley"), i18n("Maintainer"), QStringLiteral("bcooksley@kde.org")); aboutData.addAuthor(i18n("Mathias Soeken"), i18n("Developer"), QStringLiteral("msoeken@informatik.uni-bremen.de")); aboutData.addAuthor(i18n("Will Stephenson"), i18n("Internal module representation, internal module model"), QStringLiteral("wstephenson@kde.org")); if (qEnvironmentVariableIsSet("KDE_FULL_SESSION")) { aboutData.setDesktopFileName(QStringLiteral("systemsettings")); } else { aboutData.setDesktopFileName(QStringLiteral("kdesystemsettings")); } KAboutData::setApplicationData(aboutData); application.setAttribute(Qt::AA_UseHighDpiPixmaps, true); application.setWindowIcon(QIcon::fromTheme(QStringLiteral("preferences-system"))); QCommandLineParser parser; parser.addHelpOption(); parser.addVersionOption(); aboutData.setupCommandLine(&parser); parser.process(application); aboutData.processCommandLine(&parser); SettingsBase *mainWindow = new SettingsBase(); mainWindow->show(); application.setMainWindow(mainWindow); return application.exec(); }