diff --git a/TODO b/TODO index 17ddd26d..f6458687 100644 --- a/TODO +++ b/TODO @@ -1,9 +1,5 @@ qt5.6: -* remove kmxlgui 0003...patch -* remove kdelibs4support 0004...patch -* remove plasma-workspace 0007...patch -* remove kwrited 0002...patch * check build wayland only / no session management diff --git a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/files/0004-kmainwindow.cpp-remove-usage-of-QGuiApplication-setF.patch b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/files/0004-kmainwindow.cpp-remove-usage-of-QGuiApplication-setF.patch deleted file mode 100644 index 6d8ca3d7..00000000 --- a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/files/0004-kmainwindow.cpp-remove-usage-of-QGuiApplication-setF.patch +++ /dev/null @@ -1,33 +0,0 @@ -From db5b3540359e3f9b7276b52e16813b7aa01f04c6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Fri, 25 Mar 2016 15:17:18 +0100 -Subject: [PATCH] kmainwindow.cpp: remove usage of - QGuiApplication::setFallbackSessionManagementEnabled -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -meta-qt5 does not yet have a qtbase supporting this - -Signed-off-by: Andreas Müller ---- - src/kdeui/kapplication.cpp | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/src/kdeui/kapplication.cpp b/src/kdeui/kapplication.cpp -index 4743923..57d3938 100644 ---- a/src/kdeui/kapplication.cpp -+++ b/src/kdeui/kapplication.cpp -@@ -380,9 +380,6 @@ void KApplicationPrivate::init(bool GUIenabled) - parseCommandLine(); - - QGuiApplication::setDesktopSettingsAware(false); --#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) -- QGuiApplication::setFallbackSessionManagementEnabled(false); --#endif - - #if HAVE_X11 - isX11 = (QGuiApplication::platformName() == QStringLiteral("xcb")); --- -2.5.0 - diff --git a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.bb b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.bb index 79ff9bc8..6ce81862 100644 --- a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.bb +++ b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.bb @@ -33,10 +33,6 @@ DEPENDS += " \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver qtx11extras", "", d)} \ " -SRC_URI += " \ - file://0004-kmainwindow.cpp-remove-usage-of-QGuiApplication-setF.patch \ -" - # uncomment for broken gelib getaddr / AI_PASSIVE #EXTRA_OECMAKE += "-DHAVE_GOOD_GETADDRINFO=OFF" diff --git a/recipes-kde/kf5/tier3/kxmlgui/files/0003-kmainwindow-remove-usage-of-QGuiApplication-setFallb.patch b/recipes-kde/kf5/tier3/kxmlgui/files/0003-kmainwindow-remove-usage-of-QGuiApplication-setFallb.patch deleted file mode 100644 index 80236b0d..00000000 --- a/recipes-kde/kf5/tier3/kxmlgui/files/0003-kmainwindow-remove-usage-of-QGuiApplication-setFallb.patch +++ /dev/null @@ -1,33 +0,0 @@ -From b64dcbaa419a3e84c96dc3b97cd8b24f2254e5a5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Fri, 25 Mar 2016 01:04:26 +0100 -Subject: [PATCH] kmainwindow: remove usage of - QGuiApplication::setFallbackSessionManagementEnabled -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -meta-qt5 does not yet have a qtbase supporting this - -Signed-off-by: Andreas Müller ---- - src/kmainwindow.cpp | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/src/kmainwindow.cpp b/src/kmainwindow.cpp -index a745762..8358ea5 100644 ---- a/src/kmainwindow.cpp -+++ b/src/kmainwindow.cpp -@@ -220,9 +220,6 @@ KMainWindow::KMainWindow(KMainWindowPrivate &dd, QWidget *parent, Qt::WindowFlag - void KMainWindowPrivate::init(KMainWindow *_q) - { - q = _q; --#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) -- QGuiApplication::setFallbackSessionManagementEnabled(false); --#endif - q->setAnimated(q->style()->styleHint(QStyle::SH_Widget_Animate, 0, q)); - - q->setAttribute(Qt::WA_DeleteOnClose); --- -2.5.0 - diff --git a/recipes-kde/kf5/tier3/kxmlgui/kxmlgui.bb b/recipes-kde/kf5/tier3/kxmlgui/kxmlgui.bb index 4fd1c630..80e8e0de 100644 --- a/recipes-kde/kf5/tier3/kxmlgui/kxmlgui.bb +++ b/recipes-kde/kf5/tier3/kxmlgui/kxmlgui.bb @@ -25,11 +25,9 @@ SRC_URI[md5sum] = "df170e2072519d5b48e6fee2bd0d1a5c" SRC_URI[sha256sum] = "d2f94ec1d93430ba29368178bad705f8e2f6296f83c1b51af27d3b6702b066b1" # REVISIT remove ugly hack for wayland-only environments -# REVISIT remove 0003-kmainwindow.. as soon as meta-qt5 hasmoved to 5.6 SRC_URI += " \ file://0001-no-session-management-if-not-supported-by-qtbase-ind.patch \ file://0002-fix-path-to-ksendbugmail.patch \ - file://0003-kmainwindow-remove-usage-of-QGuiApplication-setFallb.patch \ " EXTRA_OECMAKE += "-DBUILD_TESTING=OFF" diff --git a/recipes-kde/plasma/tier3/plasma-workspace/files/0007-remove-usage-of-QGuiApplication-setFallbackSessionMa.patch b/recipes-kde/plasma/tier3/plasma-workspace/files/0007-remove-usage-of-QGuiApplication-setFallbackSessionMa.patch deleted file mode 100644 index 383b652c..00000000 --- a/recipes-kde/plasma/tier3/plasma-workspace/files/0007-remove-usage-of-QGuiApplication-setFallbackSessionMa.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 298d648da66d9115d8ff15de165788f5efda1fbf Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Fri, 25 Mar 2016 19:18:48 +0100 -Subject: [PATCH] remove usage of - QGuiApplication::setFallbackSessionManagementEnabled -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -meta-qt5 does not yet have a qtbase supporting this - -Signed-off-by: Andreas Müller ---- - klipper/main.cpp | 3 --- - krunner/main.cpp | 3 --- - shell/main.cpp | 3 --- - 3 files changed, 9 deletions(-) - -diff --git a/klipper/main.cpp b/klipper/main.cpp -index f63e557..598c0a8 100644 ---- a/klipper/main.cpp -+++ b/klipper/main.cpp -@@ -75,9 +75,6 @@ extern "C" int Q_DECL_EXPORT kdemain(int argc, char *argv[]) - - KAboutData::setApplicationData(aboutData); - --#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) -- QGuiApplication::setFallbackSessionManagementEnabled(false); --#endif - #ifndef QT_NO_SESSIONMANAGER - auto disableSessionManagement = [](QSessionManager &sm) { - sm.setRestartHint(QSessionManager::RestartNever); -diff --git a/krunner/main.cpp b/krunner/main.cpp -index 67226d2..924a980 100644 ---- a/krunner/main.cpp -+++ b/krunner/main.cpp -@@ -68,9 +68,6 @@ int main(int argc, char **argv) - - KAboutData::setApplicationData(aboutData); - --#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) -- QGuiApplication::setFallbackSessionManagementEnabled(false); --#endif - #ifndef QT_NO_SESSIONMANAGER - auto disableSessionManagement = [](QSessionManager &sm) { - sm.setRestartHint(QSessionManager::RestartNever); -diff --git a/shell/main.cpp b/shell/main.cpp -index c55c0bf..24c562a 100644 ---- a/shell/main.cpp -+++ b/shell/main.cpp -@@ -103,9 +103,6 @@ int main(int argc, char *argv[]) - cliOptions.process(app); - aboutData.processCommandLine(&cliOptions); - --#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) -- QGuiApplication::setFallbackSessionManagementEnabled(false); --#endif - #ifndef QT_NO_SESSIONMANAGER - auto disableSessionManagement = [](QSessionManager &sm) { - sm.setRestartHint(QSessionManager::RestartNever); --- -2.5.0 - diff --git a/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb b/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb index 9ca5c0d1..38e6d68c 100644 --- a/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb +++ b/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb @@ -52,7 +52,6 @@ SRC_URI += " \ file://0004-startkde-create-kde-s-home.patch \ file://0005-startkde-enable-starting-X.patch \ file://0006-startkde-remove-CMAKE_INSTALL_PREFIX-in-XDG_DATA_DIR.patch \ - file://0007-remove-usage-of-QGuiApplication-setFallbackSessionMa.patch \ " # cross libs / headers diff --git a/recipes-kde/plasma/untier/kwrited/files/0002-remove-usage-of-QGuiApplication-setFallbackSessionMa.patch b/recipes-kde/plasma/untier/kwrited/files/0002-remove-usage-of-QGuiApplication-setFallbackSessionMa.patch deleted file mode 100644 index 2e8ba2cf..00000000 --- a/recipes-kde/plasma/untier/kwrited/files/0002-remove-usage-of-QGuiApplication-setFallbackSessionMa.patch +++ /dev/null @@ -1,33 +0,0 @@ -From f3f6e591734312578470f9026c31042b97bed3b8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Fri, 25 Mar 2016 23:09:52 +0100 -Subject: [PATCH] remove usage of - QGuiApplication::setFallbackSessionManagementEnabled -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -meta-qt5 does not yet have a qtbase supporting this - -Signed-off-by: Andreas Müller ---- - kwrited.cpp | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/kwrited.cpp b/kwrited.cpp -index 77f7264..6785bc4 100644 ---- a/kwrited.cpp -+++ b/kwrited.cpp -@@ -73,9 +73,6 @@ int main(int argc, char **argv) - KAboutData::setApplicationData(aboutData()); - QApplication::setDesktopSettingsAware(false); - QApplication a(argc, argv); --#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) -- QGuiApplication::setFallbackSessionManagementEnabled(false); --#endif - #ifndef QT_NO_SESSIONMANAGER - auto disableSessionManagement = [](QSessionManager &sm) { - sm.setRestartHint(QSessionManager::RestartNever); --- -2.5.0 - diff --git a/recipes-kde/plasma/untier/kwrited/kwrited.bb b/recipes-kde/plasma/untier/kwrited/kwrited.bb index 2149276a..51ad5627 100644 --- a/recipes-kde/plasma/untier/kwrited/kwrited.bb +++ b/recipes-kde/plasma/untier/kwrited/kwrited.bb @@ -20,7 +20,6 @@ SRC_URI[sha256sum] = "e305d6fd109b5a318604201e4688a1fd37c77fe15981a285c6f47f63d5 SRC_URI += " \ file://0001-fix-build-for-qtbase-without-session-management.patch \ - file://0002-remove-usage-of-QGuiApplication-setFallbackSessionMa.patch \ " FILES_${PN} += " \