diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ set(PROJECT_VERSION "5.18.80") set(PROJECT_VERSION_MAJOR 5) -set(QT_MIN_VERSION "5.12.0") +set(QT_MIN_VERSION "5.14.0") set(KF5_MIN_VERSION "5.66.0") set(INSTALL_SDDM_THEME TRUE) find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Widgets Quick QuickWidgets Concurrent Test Network) diff --git a/gmenu-dbusmenu-proxy/main.cpp b/gmenu-dbusmenu-proxy/main.cpp --- a/gmenu-dbusmenu-proxy/main.cpp +++ b/gmenu-dbusmenu-proxy/main.cpp @@ -18,7 +18,6 @@ */ #include -#include #include @@ -29,19 +28,14 @@ qputenv("QT_QPA_PLATFORM", "xcb"); QGuiApplication::setDesktopSettingsAware(false); + QCoreApplication::setAttribute(Qt::AA_DisableSessionManager); QGuiApplication app(argc, argv); if (!KWindowSystem::isPlatformX11()) { qFatal("qdbusmenuproxy is only useful XCB. Aborting"); } - auto disableSessionManagement = [](QSessionManager &sm) { - sm.setRestartHint(QSessionManager::RestartNever); - }; - QObject::connect(&app, &QGuiApplication::commitDataRequest, disableSessionManagement); - QObject::connect(&app, &QGuiApplication::saveStateRequest, disableSessionManagement); - app.setQuitOnLastWindowClosed(false); MenuProxy proxy; diff --git a/krunner/main.cpp b/krunner/main.cpp --- a/krunner/main.cpp +++ b/krunner/main.cpp @@ -24,7 +24,6 @@ #include #include #include -#include #include #include @@ -44,6 +43,7 @@ qunsetenv("QT_DEVICE_PIXEL_RATIO"); QCommandLineParser parser; QCoreApplication::setAttribute(Qt::AA_DisableHighDpiScaling); + QCoreApplication::setAttribute(Qt::AA_DisableSessionManager); const bool qpaVariable = qEnvironmentVariableIsSet("QT_QPA_PLATFORM"); KWorkSpace::detectPlatform(argc, argv); @@ -91,14 +91,6 @@ KDBusService service(KDBusService::Unique | KDBusService::StartupOption(parser.isSet(replaceOption) ? KDBusService::Replace : 0)); - QGuiApplication::setFallbackSessionManagementEnabled(false); - - auto disableSessionManagement = [](QSessionManager &sm) { - sm.setRestartHint(QSessionManager::RestartNever); - }; - QObject::connect(&app, &QGuiApplication::commitDataRequest, disableSessionManagement); - QObject::connect(&app, &QGuiApplication::saveStateRequest, disableSessionManagement); - View view; auto updateVisibility = [&]() { diff --git a/shell/main.cpp b/shell/main.cpp --- a/shell/main.cpp +++ b/shell/main.cpp @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include @@ -63,6 +62,7 @@ } else { QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); } + QCoreApplication::setAttribute(Qt::AA_DisableSessionManager); QQuickWindow::setDefaultAlphaBuffer(true); @@ -139,14 +139,6 @@ cliOptions.process(app); aboutData.processCommandLine(&cliOptions); - QGuiApplication::setFallbackSessionManagementEnabled(false); - - auto disableSessionManagement = [](QSessionManager &sm) { - sm.setRestartHint(QSessionManager::RestartNever); - }; - QObject::connect(&app, &QGuiApplication::commitDataRequest, disableSessionManagement); - QObject::connect(&app, &QGuiApplication::saveStateRequest, disableSessionManagement); - ShellCorona* corona = new ShellCorona(&app); corona->setShell(cliOptions.value(shellPluginOption)); diff --git a/xembed-sni-proxy/main.cpp b/xembed-sni-proxy/main.cpp --- a/xembed-sni-proxy/main.cpp +++ b/xembed-sni-proxy/main.cpp @@ -19,7 +19,6 @@ */ #include -#include #include "fdoselectionmanager.h" @@ -42,19 +41,14 @@ qputenv("QT_QPA_PLATFORM", "xcb"); QGuiApplication::setDesktopSettingsAware(false); + QCoreApplication::setAttribute(Qt::AA_DisableSessionManager); QGuiApplication app(argc, argv); if (!KWindowSystem::isPlatformX11()) { qFatal("xembed-sni-proxy is only useful XCB. Aborting"); } - auto disableSessionManagement = [](QSessionManager &sm) { - sm.setRestartHint(QSessionManager::RestartNever); - }; - QObject::connect(&app, &QGuiApplication::commitDataRequest, disableSessionManagement); - QObject::connect(&app, &QGuiApplication::saveStateRequest, disableSessionManagement); - app.setQuitOnLastWindowClosed(false); qDBusRegisterMetaType();