diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ba6deed3..824498cf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,5 +3,4 @@ include: - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/reuse-lint.yml - - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml diff --git a/.kde-ci.yml b/.kde-ci.yml index 780ab088..652f7e1f 100644 --- a/.kde-ci.yml +++ b/.kde-ci.yml @@ -4,19 +4,19 @@ Dependencies: - 'on': ['@all'] 'require': - 'frameworks/extra-cmake-modules': '@latest' - 'frameworks/kconfig': '@latest' - 'frameworks/kcoreaddons': '@latest' - 'frameworks/ki18n': '@latest' - 'frameworks/kio': '@latest' - 'frameworks/knotifications': '@latest' - 'frameworks/kpackage': '@latest' - 'frameworks/kservice': '@latest' - 'frameworks/kwayland': '@latest' - 'frameworks/kwindowsystem': '@latest' - 'frameworks/modemmanager-qt': '@latest' - 'frameworks/networkmanager-qt': '@latest' - 'frameworks/plasma-framework': '@latest' + 'frameworks/extra-cmake-modules': '@latest-kf6' + 'frameworks/kconfig': '@latest-kf6' + 'frameworks/kcoreaddons': '@latest-kf6' + 'frameworks/ki18n': '@latest-kf6' + 'frameworks/kio': '@latest-kf6' + 'frameworks/knotifications': '@latest-kf6' + 'frameworks/kpackage': '@latest-kf6' + 'frameworks/kservice': '@latest-kf6' + 'frameworks/kwayland': '@latest-kf6' + 'frameworks/kwindowsystem': '@latest-kf6' + 'frameworks/modemmanager-qt': '@latest-kf6' + 'frameworks/networkmanager-qt': '@latest-kf6' + 'frameworks/plasma-framework': '@latest-kf6' 'plasma/kwin': '@same' 'plasma/plasma-workspace': '@same' 'libraries/kirigami-addons': '@latest' diff --git a/CMakeLists.txt b/CMakeLists.txt index b97a9535..76fadc07 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,20 +10,18 @@ project(plasma-mobile) set(PROJECT_VERSION "5.27.80") set(PROJECT_VERSION_MAJOR 5) -set(QT_MIN_VERSION "5.15.2") -set(KF5_MIN_VERSION "5.102.0") +set(QT_MIN_VERSION "6.4.0") +set(KF6_MIN_VERSION "5.240.0") set(KDE_COMPILERSETTINGS_LEVEL "5.82") set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) -find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) +find_package(ECM ${KF6_MIN_VERSION} REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) set(KF_IGNORE_PLATFORM_CHECK ON CACHE BOOL "Don't check platform that is being built on") -option(QUICK_COMPILER "Use QtQuick compiler to improve performance" FALSE) - include(KDEInstallDirs) include(KDECMakeSettings) include(KDECompilerSettings NO_POLICY_SCOPE) @@ -52,15 +50,11 @@ find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED Qml Quick ) -if (QT_MAJOR_VERSION STREQUAL "5") - if (QUICK_COMPILER) - find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED QuickCompiler) - endif() -endif() -find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS +find_package(KF6 ${KF6_MIN_VERSION} REQUIRED COMPONENTS I18n KIO + Config DBusAddons Plasma PlasmaQuick @@ -86,7 +80,7 @@ include(CheckIncludeFiles) ecm_find_qmlmodule(org.kde.pipewire 0.1) -plasma_install_package(look-and-feel org.kde.plasma.phone look-and-feel) +plasma_install_package(look-and-feel org.kde.breeze.mobile look-and-feel lookandfeel) plasma_install_package(shell org.kde.plasma.phoneshell shells) install(FILES plasma_phone_components.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFYRCDIR}) diff --git a/components/mmplugin/CMakeLists.txt b/components/mmplugin/CMakeLists.txt index 07128ef4..222b310d 100644 --- a/components/mmplugin/CMakeLists.txt +++ b/components/mmplugin/CMakeLists.txt @@ -9,10 +9,10 @@ target_sources(ppc-mmqmlplugin PRIVATE target_link_libraries(ppc-mmqmlplugin Qt::Qml - KF5::ModemManagerQt - KF5::NetworkManagerQt - KF5::CoreAddons - KF5::I18n + KF6::ModemManagerQt + KF6::NetworkManagerQt + KF6::CoreAddons + KF6::I18n ) set_property(TARGET ppc-mmqmlplugin PROPERTY LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/org/kde/plasma/mm) diff --git a/components/mobileshell/CMakeLists.txt b/components/mobileshell/CMakeLists.txt index 33316ab3..174895ce 100644 --- a/components/mobileshell/CMakeLists.txt +++ b/components/mobileshell/CMakeLists.txt @@ -19,15 +19,7 @@ set(mobileshellplugin_SRCS notifications/notificationfilemenu.cpp taskswitcher/displaysmodel.cpp ) -if (QT_MAJOR_VERSION STREQUAL "5") - if(QUICK_COMPILER) - qtquick_compiler_add_resources(RESOURCES resources.qrc) - else() - qt5_add_resources(RESOURCES resources.qrc) - endif() -else() - qt_add_resources(RESOURCES resources.qrc) -endif() +qt_add_resources(RESOURCES resources.qrc) add_library(mobileshellplugin SHARED ${mobileshellplugin_SRCS} ${RESOURCES}) target_link_libraries(mobileshellplugin @@ -38,17 +30,17 @@ target_link_libraries(mobileshellplugin Qt::Qml Qt::Gui Qt::Quick - KF5::ConfigWidgets # for KStandardAction - KF5::KIOGui - KF5::Plasma - KF5::I18n - KF5::Notifications - KF5::PlasmaQuick - KF5::KIOGui - KF5::KIOWidgets # for PreviewJob - KF5::WaylandClient - KF5::Service - KF5::Package + KF6::ConfigWidgets # for KStandardAction + KF6::KIOGui + KF6::Plasma + KF6::I18n + KF6::Notifications + KF6::PlasmaQuick + KF6::KIOGui + KF6::KIOWidgets # for PreviewJob + KF6::WaylandClient + KF6::Service + KF6::Package ) # we compiled the qml files, just install qmldir diff --git a/components/mobileshellstate/CMakeLists.txt b/components/mobileshellstate/CMakeLists.txt index ec561c44..f2908436 100644 --- a/components/mobileshellstate/CMakeLists.txt +++ b/components/mobileshellstate/CMakeLists.txt @@ -7,15 +7,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..) set(mobileshellstateplugin_SRCS mobileshellstateplugin.cpp ) -if (QT_MAJOR_VERSION STREQUAL "5") - if(QUICK_COMPILER) - qtquick_compiler_add_resources(RESOURCES resources.qrc) - else() - qt5_add_resources(RESOURCES resources.qrc) - endif() -else() - qt_add_resources(RESOURCES resources.qrc) -endif() +qt_add_resources(RESOURCES resources.qrc) add_library(mobileshellstateplugin SHARED ${mobileshellstateplugin_SRCS} ${RESOURCES}) target_link_libraries(mobileshellstateplugin @@ -26,10 +18,10 @@ target_link_libraries(mobileshellstateplugin Qt::Qml Qt::Gui Qt::Quick - KF5::Plasma - KF5::I18n - KF5::Notifications - KF5::PlasmaQuick + KF6::Plasma + KF6::I18n + KF6::Notifications + KF6::PlasmaQuick ) # we compiled the qml files, just install qmldir diff --git a/containments/homescreens/folio/CMakeLists.txt b/containments/homescreens/folio/CMakeLists.txt index 91b57dcf..53939101 100644 --- a/containments/homescreens/folio/CMakeLists.txt +++ b/containments/homescreens/folio/CMakeLists.txt @@ -11,15 +11,15 @@ add_library(plasma_containment_phone_homescreen MODULE ${homescreen_SRCS}) target_link_libraries(plasma_containment_phone_homescreen Qt::Gui - KF5::Plasma Qt::Qml Qt::Quick - KF5::I18n - KF5::Service - KF5::KIOGui - KF5::Notifications - KF5::WaylandClient - KF5::WindowSystem + KF6::Plasma + KF6::I18n + KF6::Service + KF6::KIOGui + KF6::Notifications + KF6::WaylandClient + KF6::WindowSystem ) diff --git a/containments/homescreens/halcyon/CMakeLists.txt b/containments/homescreens/halcyon/CMakeLists.txt index ac7ee2de..50f32646 100644 --- a/containments/homescreens/halcyon/CMakeLists.txt +++ b/containments/homescreens/halcyon/CMakeLists.txt @@ -14,15 +14,15 @@ add_library(plasma_containment_phone_homescreen_halcyon MODULE ${homescreen_SRCS target_link_libraries(plasma_containment_phone_homescreen_halcyon Qt::Gui - KF5::Plasma Qt::Qml Qt::Quick - KF5::I18n - KF5::Service - KF5::KIOGui - KF5::Notifications - KF5::WaylandClient - KF5::WindowSystem + KF6::Plasma + KF6::I18n + KF6::Service + KF6::KIOGui + KF6::Notifications + KF6::WaylandClient + KF6::WindowSystem ) install(TARGETS plasma_containment_phone_homescreen_halcyon DESTINATION ${KDE_INSTALL_PLUGINDIR}/plasma/applets) diff --git a/containments/panel/CMakeLists.txt b/containments/panel/CMakeLists.txt index da0de173..c65ed31a 100644 --- a/containments/panel/CMakeLists.txt +++ b/containments/panel/CMakeLists.txt @@ -12,9 +12,9 @@ add_library(plasma_applet_phonepanel MODULE ${phonepanel_SRCS}) target_link_libraries(plasma_applet_phonepanel Qt::Gui Qt::DBus - KF5::Plasma - KF5::I18n - KF5::Service + KF6::Plasma + KF6::I18n + KF6::Service ) install(TARGETS plasma_applet_phonepanel DESTINATION ${KDE_INSTALL_PLUGINDIR}/plasma/applets) diff --git a/containments/taskpanel/CMakeLists.txt b/containments/taskpanel/CMakeLists.txt index 78a7b253..a70ef20e 100644 --- a/containments/taskpanel/CMakeLists.txt +++ b/containments/taskpanel/CMakeLists.txt @@ -10,12 +10,12 @@ add_library(plasma_containment_phone_taskpanel MODULE taskpanel.cpp ${DBUS_SRCS} target_link_libraries(plasma_containment_phone_taskpanel Qt::Gui Qt::DBus - KF5::Plasma Qt::Qml Qt::Quick - KF5::I18n - KF5::Service - KF5::WaylandClient + KF6::Plasma + KF6::I18n + KF6::Service + KF6::WaylandClient ) diff --git a/kcms/mobileshell/CMakeLists.txt b/kcms/mobileshell/CMakeLists.txt index 5c99eab0..bc5c3fc8 100644 --- a/kcms/mobileshell/CMakeLists.txt +++ b/kcms/mobileshell/CMakeLists.txt @@ -5,10 +5,10 @@ kcoreaddons_add_plugin(kcm_mobileshell SOURCES kcm.cpp INSTALL_NAMESPACE "plasma target_link_libraries(kcm_mobileshell Qt::Core - KF5::CoreAddons - KF5::KCMUtils - KF5::I18n - KF5::QuickAddons + KF6::CoreAddons + KF6::KCMUtils + KF6::I18n + KF6::QuickAddons ) kcmutils_generate_desktop_file(kcm_mobileshell) diff --git a/kded/CMakeLists.txt b/kded/CMakeLists.txt index c6465495..0910db4a 100644 --- a/kded/CMakeLists.txt +++ b/kded/CMakeLists.txt @@ -12,10 +12,10 @@ target_sources(kded_plasma_mobile_start PRIVATE target_link_libraries(kded_plasma_mobile_start PRIVATE Qt::Core - KF5::DBusAddons - KF5::ConfigWidgets - KF5::KIOGui - KF5::Notifications - KF5::Package + KF6::DBusAddons + KF6::ConfigWidgets + KF6::KIOGui + KF6::Notifications + KF6::Package ) diff --git a/kded/settings.cpp b/kded/settings.cpp index cb6f1e34..50876981 100644 --- a/kded/settings.cpp +++ b/kded/settings.cpp @@ -17,7 +17,7 @@ const QString CONFIG_FILE = QStringLiteral("plasmamobilerc"); const QString INITIAL_START_CONFIG_GROUP = QStringLiteral("InitialStart"); const QString SAVED_CONFIG_GROUP = QStringLiteral("SavedConfig"); -const QString MOBILE_LOOK_AND_FEEL = QStringLiteral("org.kde.plasma.phone"); +const QString MOBILE_LOOK_AND_FEEL = QStringLiteral("org.kde.breeze.mobile"); const QString LOOK_AND_FEEL_KEY = QStringLiteral("LookAndFeelPackage"); Settings::Settings(QObject *parent) diff --git a/look-and-feel/Messages.sh b/look-and-feel/Messages.sh new file mode 100644 index 00000000..3f3650c7 --- /dev/null +++ b/look-and-feel/Messages.sh @@ -0,0 +1,2 @@ +#! /usr/bin/env bash +$XGETTEXT `find . -name \*.js -o -name \*.qml -o -name \*.cpp` -o $podir/plasma_lookandfeel_org.kde.breeze.mobile.pot diff --git a/look-and-feel/metadata.desktop b/look-and-feel/metadata.desktop deleted file mode 100644 index c9cd52f5..00000000 --- a/look-and-feel/metadata.desktop +++ /dev/null @@ -1,132 +0,0 @@ -# SPDX-FileCopyrightText: 2014 Aaron J. Seigo -# SPDX-License-Identifier: GPL-2.0-or-later - -[Desktop Entry] -Name=Plasma Mobile -Name[az]=Plasma Mobil -Name[ca]=Plasma Mobile -Name[ca@valencia]=Plasma Mobile -Name[cs]=Plasma Mobile -Name[da]=Plasma Mobile -Name[de]=Plasma Mobile -Name[en_GB]=Plasma Mobile -Name[es]=Plasma Mobile -Name[et]=Plasma Mobile -Name[eu]=Plasma Mugikorra -Name[fi]=Plasma Mobile -Name[fr]=Plasma Mobile -Name[gl]=Plasma Mobile -Name[hi]=प्लाज़्मा मोबाइल -Name[hu]=Plasma Mobile -Name[ia]=Plasma Mobile -Name[id]=Plasma Mobile -Name[is]=Plasma Mobile -Name[it]=Plasma Mobile -Name[ka]=Plasma Mobile -Name[ko]=Plasma 모바일 -Name[lt]=Plasma mobilioji sąsaja -Name[nl]=Plasma Mobile -Name[nn]=Plasma Mobile -Name[pa]=ਪਲਾਜ਼ਮਾ ਮੋਬਾਈਲ -Name[pl]=Przenośna Plazma -Name[pt]=Plasma Mobile -Name[pt_BR]=Plasma Mobile -Name[ro]=Plasma Mobile -Name[ru]=Plasma Mobile -Name[sk]=Plasma Mobile -Name[sl]=Plasma Mobile -Name[sv]=Plasma mobil -Name[tr]=Plasma Mobile -Name[uk]=Мобільна Плазма -Name[x-test]=xxPlasma Mobilexx -Name[zh_CN]=Plasma Mobile -Name[zh_TW]=Plasma 行動 -Comment=Plasma workspace for smartphones -Comment[az]=Smartfonlar üçün Plasma iş sahəsi -Comment[ca]=Espai de treball del Plasma per a telèfons intel·ligents -Comment[ca@valencia]=Espai de treball Plasma per a telèfons intel·ligents -Comment[da]=Plasma arbejdsområde til smartphones -Comment[de]=Plasma-Arbeitsbereich für Smartphones -Comment[en_GB]=Plasma workspace for smartphones -Comment[es]=Espacio de trabajo de Plasma para teléfonos inteligentes -Comment[et]=Plasma nutitelefonide tööruum -Comment[eu]=Telefono adimendunetarako Plasma langunea -Comment[fi]=Plasma-työtila älypuhelimiin -Comment[fr]=Espace de travail Plasma pour smartphones -Comment[gl]=Espazo de traballo de Plasma para móbiles intelixentes. -Comment[hi]=स्मार्टफोन के लिए प्लाज्मा कार्यक्षेत्र -Comment[hu]=Plasma felület okostelefonokhoz -Comment[ia]=Spatio de labor de Plasma per smartphones -Comment[id]=Kerangka kerja Plasma untuk smartphone -Comment[is]=Plasma vinnusvæði fyrir snjallsíma -Comment[it]=Spazio di lavoro Plasma per smartphone -Comment[ka]=Plasma-ის სამუშაო გარემო სმარტფონებისთვის -Comment[ko]=스마트폰용 Plasma 작업 공간 -Comment[lt]=Plasma darbo sritis, skirta išmaniesiems telefonams -Comment[nl]=Plasma workspace voor smartphones -Comment[nn]=Plasma-arbeidsområde for smarttelefonar -Comment[pa]=ਸਮਾਰਟ-ਫ਼ੋਨ ਲਈ ਪਲਾਜ਼ਮਾ ਵਰਕਸਪੇਸ -Comment[pl]=Przestrzeń pracy Plazmy dla smartfonów -Comment[pt]=Área de trabalho Plasma para telemóveis -Comment[pt_BR]=Espaço de trabalho Plasma para celulares -Comment[ro]=Spațiu de lucru al Plasma pentru telefoane inteligente -Comment[ru]=Среда рабочего стола Plasma для смартфонов -Comment[sk]=Plasma pracovný priestor pre smartfóny -Comment[sl]=Plasmin delovni prostor za pametne telefone -Comment[sv]=Plasma arbetsyta för smarta telefoner -Comment[tr]=Akıllı telefonlar için Plasma çalışma alanı -Comment[uk]=Робочий простір Плазми для смартфонів -Comment[x-test]=xxPlasma workspace for smartphonesxx -Comment[zh_CN]=专为手机定制的 Plasma 工作空间 -Comment[zh_TW]=智慧型手機的 Plasma 工作空間 -Keywords=Phone, Workspace, Look and Feel -Keywords[az]=Telefon, İş sahəsi, Xarici görünüş -Keywords[ca]=Telèfon, Espai de treball, Aspecte i comportament -Keywords[ca@valencia]=Telèfon, Espai de treball, Aspecte i comportament -Keywords[da]=Telefon, arbejdsområde, udseende og fremtoning -Keywords[de]=Telefon, Handy, Smartphone, Arbeitsbereich, Erscheinungsbild -Keywords[en_GB]=Phone, Workspace, Look and Feel -Keywords[es]=Teléfono, espacio de trabajo, aspecto visual -Keywords[et]=telefon, tööruum, välimus -Keywords[eu]=Telefonoa, langunea, itxura eta izaera -Keywords[fi]=Puhelin, työtila, ulkoasu ja tuntuma -Keywords[fr]=Téléphone, Espace de travail, Apparence -Keywords[gl]=teléfono, espazo de traballo, aparencia e comportamento -Keywords[hi]=फोन, कार्यक्षेत्र, रंगरूप और अनुभव -Keywords[hu]=Telefon, Munkaterület, Megjelenés -Keywords[ia]=Phone (Telephono), Spatio de labor, Apparentia -Keywords[id]=Ponsel, Kerangkakerja, Nuansa dan Suasana -Keywords[is]=Sími, vinnusvæði, útlit og viðkoma -Keywords[it]=Telefono, Spazio di lavoro, Aspetto -Keywords[ka]=ტელეფონი, სამუშაო გარემო, გრძნობა და გარეგნბა -Keywords[ko]=Phone, Workspace, Look and Feel, 전화, 작업 공간, 모습 -Keywords[lt]=Telefonas, Darbo sritis, Išvaizda ir turinys, Isvaizda ir turinys -Keywords[nl]=Telefoon, werkruimte, uiterlijk -Keywords[nn]=telefon, arbeidsflate, utsjånad -Keywords[pa]=ਫ਼ੋਨ,ਵਰਕਸਪੇਸ, ਦਿੱਖ ਤੇ ਅਨੁਭਵ -Keywords[pl]=Telefon, Przestrzeń robocza, Wrażenia wzrokowe i dotykowe -Keywords[pt]=Telefone, Telemóvel, Área de Trabalho, Aparência e Comportamento -Keywords[pt_BR]=Celular, telefone, espaço de trabalho, aparência -Keywords[ro]=Telefon, Spațiu de lucru, Aspect și comportament -Keywords[ru]=Phone, Workspace, Look and Feel, Телефон, рабочий стол, рабочая среда, внешний вид -Keywords[sk]=Telefón, Pracovný priestor, Vzhľad -Keywords[sl]=Telefon, delovni prostor, videz in izkušnja -Keywords[sv]=Telefon, arbetsyta, utseende och känsla -Keywords[tr]=Telefon, Çalışma alanı, Görünüm -Keywords[uk]=Телефон, Робочий простір, Вигляд і поведінка -Keywords[x-test]=xxPhone, Workspace, Look and Feelxx -Keywords[zh_CN]=Phone, Workspace, Look and Feel, 手机, 工作空间, 界面外观 -Keywords[zh_TW]=電話、工作空間、外觀與感覺 -Type=Service - -X-KDE-ServiceTypes=Plasma/LookAndFeel -X-KDE-ParentApp= -X-KDE-PluginInfo-Author= -X-KDE-PluginInfo-Category= -X-KDE-PluginInfo-Email= -X-KDE-PluginInfo-License=GPLv2+ -X-KDE-PluginInfo-Name=org.kde.plasma.phone -X-KDE-PluginInfo-Version=0.1 -X-KDE-PluginInfo-Website= -X-Plasma-APIVersion=2 -X-Plasma-MainScript=defaults diff --git a/look-and-feel/metadata.json b/look-and-feel/metadata.json new file mode 100644 index 00000000..c2ed9071 --- /dev/null +++ b/look-and-feel/metadata.json @@ -0,0 +1,61 @@ +{ + "KPackageStructure": "Plasma/LookAndFeel", + "KPlugin": { + "Authors": [ + { + "Email": "plasma-mobile@kde.org", + "Name": "KDE Visual Design Group", + "Name[ar]": "مجموعة التصميم المرئي لكدي", + "Name[az]": "KDE Vizual Dizayn Qrupu", + "Name[be]": "Суполка візуальнага дызайну KDE", + "Name[bg]": "KDE Visual Design Group", + "Name[ca@valencia]": "Grup de disseny visual de KDE", + "Name[ca]": "Grup de disseny visual de KDE", + "Name[cs]": "Skupina vizuálního návrhu KDE", + "Name[da]": "KDE Visual Design Group", + "Name[de]": "KDE Visual Design Group", + "Name[en_GB]": "KDE Visual Design Group", + "Name[es]": "El grupo de diseño visual de KDE", + "Name[eu]": "KDE Diseinu bisualeko taldea", + "Name[fi]": "KDE:n visuaalinen suunnitteluryhmä", + "Name[fr]": "Groupe de conception visuelle de KDE", + "Name[hi]": "केडीई विज़ुअल डिज़ाइन दल", + "Name[hu]": "KDE Visual Design Group", + "Name[ia]": "KDE Visual Design Group (Gruppo de Designo Visual de KDE)", + "Name[id]": "Grup Desain Visual KDE", + "Name[is]": "Myndrænn hönnunarhópur KDE", + "Name[it]": "KDE Visual Design Group", + "Name[ja]": "KDE Visual Design Group", + "Name[ka]": "KDE-ის ვიზუალური დიზაინის ჯგუფი", + "Name[ko]": "KDE 시각 디자인 그룹", + "Name[lt]": "KDE vaizdinio dizaino grupė", + "Name[nl]": "KDE Visuele ontwerpgroep", + "Name[nn]": "KDE Visual Design Group", + "Name[pl]": "Grupa oprawy graficznej KDE", + "Name[pt]": "Grupo de Desenho Visual do KDE", + "Name[pt_BR]": "Grupo de Design Visual do KDE", + "Name[ro]": "KDE Visual Design Group", + "Name[ru]": "Группа KDE Visual Design", + "Name[sk]": "KDE Visual Design Group", + "Name[sl]": "Skupina vizualnega designa KDE", + "Name[sv]": "KDE:s visuella designgrupp", + "Name[ta]": "கே.டீ.யீ. வரைகலை வடிவமைப்புக் குழு", + "Name[tr]": "KDE Görsel Tasarım Grubu", + "Name[uk]": "Група з візуального дизайну KDE", + "Name[vi]": "Đội Thiết kế Trực quan KDE", + "Name[x-test]": "xxKDE Visual Design Groupxx", + "Name[zh_CN]": "KDE 视觉设计团队" + } + ], + "Category": "", + "Description": "Plasma for mobile devices", + "Id": "org.kde.breeze.mobile", + "License": "GPLv2+", + "Name": "Plasma Mobile Breeze", + "Version": "2.0", + "Website": "https://www.kde.org" + }, + "Keywords": "Phone;Mobile;Desktop;Workspace;Appearance;Look and Feel;Logout;Lock;Suspend;Shutdown;Hibernate;", + "X-Plasma-APIVersion": "2", + "X-Plasma-MainScript": "defaults" +} diff --git a/quicksettings/flashlight/CMakeLists.txt b/quicksettings/flashlight/CMakeLists.txt index 3666e670..d8a9297e 100644 --- a/quicksettings/flashlight/CMakeLists.txt +++ b/quicksettings/flashlight/CMakeLists.txt @@ -9,21 +9,17 @@ set(flashlightplugin_SRCS add_library(flashlightplugin ${flashlightplugin_SRCS}) -find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS - Declarative -) - target_link_libraries(flashlightplugin PUBLIC Qt::Core PRIVATE Qt::DBus - KF5::CoreAddons - KF5::QuickAddons - KF5::ConfigCore - KF5::ConfigGui - KF5::I18n - KF5::Notifications + KF6::CoreAddons + KF6::QuickAddons + KF6::ConfigCore + KF6::ConfigGui + KF6::I18n + KF6::Notifications ) set_property(TARGET flashlightplugin PROPERTY LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/org/kde/plasma/quicksetting/flashlight) diff --git a/quicksettings/nightcolor/CMakeLists.txt b/quicksettings/nightcolor/CMakeLists.txt index 9243a83d..cd0a3be4 100644 --- a/quicksettings/nightcolor/CMakeLists.txt +++ b/quicksettings/nightcolor/CMakeLists.txt @@ -15,20 +15,15 @@ kconfig_add_kcfg_files(nightcolorplugin_SRCS nightcolorsettings.kcfgc GENERATE_M add_library(nightcolorplugin ${nightcolorplugin_SRCS}) -find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS - Config - Declarative -) - target_link_libraries(nightcolorplugin PUBLIC Qt::Core PRIVATE Qt::DBus - KF5::CoreAddons - KF5::QuickAddons - KF5::ConfigCore - KF5::ConfigGui + KF6::CoreAddons + KF6::QuickAddons + KF6::ConfigCore + KF6::ConfigGui ) set_property(TARGET nightcolorplugin PROPERTY LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/org/kde/plasma/quicksetting/nightcolor) diff --git a/quicksettings/powermenu/CMakeLists.txt b/quicksettings/powermenu/CMakeLists.txt index f50ced91..cc5b36dd 100644 --- a/quicksettings/powermenu/CMakeLists.txt +++ b/quicksettings/powermenu/CMakeLists.txt @@ -8,19 +8,14 @@ set(powermenuplugin_SRCS add_library(powermenuplugin ${powermenuplugin_SRCS}) -find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS - Config - Declarative -) - find_package(LibKWorkspace) target_link_libraries(powermenuplugin PUBLIC Qt::Core PRIVATE - KF5::CoreAddons - KF5::QuickAddons + KF6::CoreAddons + KF6::QuickAddons PW::KWorkspace ) diff --git a/quicksettings/record/CMakeLists.txt b/quicksettings/record/CMakeLists.txt index 4024d392..5aa08dc8 100644 --- a/quicksettings/record/CMakeLists.txt +++ b/quicksettings/record/CMakeLists.txt @@ -8,22 +8,17 @@ set(recordplugin_SRCS add_library(recordplugin ${recordplugin_SRCS}) -find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS - Declarative - Notifications -) - target_link_libraries(recordplugin PUBLIC Qt::Core PRIVATE Qt::DBus - KF5::CoreAddons - KF5::QuickAddons - KF5::ConfigCore - KF5::ConfigGui - KF5::I18n - KF5::Notifications + KF6::CoreAddons + KF6::QuickAddons + KF6::ConfigCore + KF6::ConfigGui + KF6::I18n + KF6::Notifications ) set_property(TARGET recordplugin PROPERTY LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/org/kde/plasma/quicksetting/record) diff --git a/quicksettings/screenrotation/CMakeLists.txt b/quicksettings/screenrotation/CMakeLists.txt index 39d39a55..b33188e9 100644 --- a/quicksettings/screenrotation/CMakeLists.txt +++ b/quicksettings/screenrotation/CMakeLists.txt @@ -11,21 +11,17 @@ set(screenrotationplugin_SRCS add_library(screenrotationplugin ${screenrotationplugin_SRCS}) -find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS - Declarative -) - target_link_libraries(screenrotationplugin PUBLIC Qt::Core PRIVATE Qt::DBus - KF5::CoreAddons - KF5::QuickAddons - KF5::ConfigCore - KF5::ConfigGui - KF5::I18n - KF5::Notifications + KF6::CoreAddons + KF6::QuickAddons + KF6::ConfigCore + KF6::ConfigGui + KF6::I18n + KF6::Notifications ) set_property(TARGET screenrotationplugin PROPERTY LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/org/kde/plasma/quicksetting/screenrotation) diff --git a/quicksettings/screenshot/CMakeLists.txt b/quicksettings/screenshot/CMakeLists.txt index 927f966b..9baccd55 100644 --- a/quicksettings/screenshot/CMakeLists.txt +++ b/quicksettings/screenshot/CMakeLists.txt @@ -11,21 +11,17 @@ set(screenshotplugin_SRCS add_library(screenshotplugin ${screenshotplugin_SRCS}) -find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS - Declarative -) - target_link_libraries(screenshotplugin PUBLIC Qt::Core PRIVATE Qt::DBus - KF5::CoreAddons - KF5::QuickAddons - KF5::ConfigCore - KF5::ConfigGui - KF5::I18n - KF5::Notifications + KF6::CoreAddons + KF6::QuickAddons + KF6::ConfigCore + KF6::ConfigGui + KF6::I18n + KF6::Notifications ) set_property(TARGET screenshotplugin PROPERTY LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/org/kde/plasma/quicksetting/screenshot) diff --git a/shell/contents/defaults b/shell/contents/defaults index 6c56e620..7d3e8921 100644 --- a/shell/contents/defaults +++ b/shell/contents/defaults @@ -4,7 +4,7 @@ # SPDX-License-Identifier: GPL-2.0-or-later [kdeglobals][KDE] -LookAndFeelPackage=org.kde.plasma.phone +LookAndFeelPackage=org.kde.breeze.mobile [Desktop] Containment=org.kde.phone.homescreen.halcyon diff --git a/tests/README.md b/tests/README.md index f3131a40..c00ee502 100644 --- a/tests/README.md +++ b/tests/README.md @@ -12,5 +12,5 @@ Be sure to have the project installed on the system. To test the power menu, the following command can be used to invoke `ksmserver-logout-greeter` with the mobile look and feel in a window: ```shell -~/kde/usr/lib/libexec/ksmserver-logout-greeter --windowed --lookandfeel org.kde.plasma.phone +~/kde/usr/lib/libexec/ksmserver-logout-greeter --windowed --lookandfeel org.kde.breeze.mobile ```