From 66b734dfc611f5cd0a807c868b973ca251b26cdf Mon Sep 17 00:00:00 2001 From: David Edmundson Date: Mon, 11 Feb 2019 15:01:25 +0000 Subject: [PATCH] Drop pre Qt5.12 workarounds Test Plan: None Reviewers: #plasma, #kwin, zzag Reviewed By: #plasma, #kwin, zzag Subscribers: plasma-devel Tags: #plasma Differential Revision: https://phabricator.kde.org/D18514 --- CMakeLists.txt | 2 +- logout-greeter/main.cpp | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 17f005594..ed6b56e78 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ project(plasma-workspace) set(PROJECT_VERSION "5.15.80") set(PROJECT_VERSION_MAJOR 5) -set(QT_MIN_VERSION "5.11.0") +set(QT_MIN_VERSION "5.12.0") set(KF5_MIN_VERSION "5.54.0") set(INSTALL_SDDM_THEME TRUE) find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Widgets Quick QuickWidgets Concurrent Test Network) diff --git a/logout-greeter/main.cpp b/logout-greeter/main.cpp index 5aae8036d..af2c20083 100644 --- a/logout-greeter/main.cpp +++ b/logout-greeter/main.cpp @@ -34,10 +34,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. int main(int argc, char *argv[]) { - if (QLibraryInfo::version() < QVersionNumber(5, 12)) { - // Before Qt 5.12, the xdg-shell v6 integration does not support fullscreen. - qputenv("QT_WAYLAND_SHELL_INTEGRATION", "wl-shell"); - } qunsetenv("SESSION_MANAGER"); KWorkSpace::detectPlatform(argc, argv);