From 07394e919e5c7c9ca9cd6e596bb7f9f10a249812 Mon Sep 17 00:00:00 2001 From: Nicolas Fella Date: Sat, 23 Jul 2022 00:53:23 +0200 Subject: [PATCH] Remove code for QWS It hasn't been a thing for an entire Qt major version --- libkworkspace/kworkspace.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/libkworkspace/kworkspace.cpp b/libkworkspace/kworkspace.cpp index 7be6b6309..270ab84f9 100644 --- a/libkworkspace/kworkspace.cpp +++ b/libkworkspace/kworkspace.cpp @@ -25,12 +25,6 @@ #include #endif -#if HAVE_X11 -#define DISPLAY "DISPLAY" -#elif defined(Q_WS_QWS) -#define DISPLAY "QWS_DISPLAY" -#endif - #include "config-workspace.h" #ifdef HAVE_UNISTD_H @@ -81,7 +75,7 @@ void propagateSessionManager() { #if HAVE_X11 QByteArray fName = QFile::encodeName(QStandardPaths::writableLocation(QStandardPaths::RuntimeLocation) + "/KSMserver"); - QString display = QString::fromLocal8Bit(::getenv(DISPLAY)); + QString display = QString::fromLocal8Bit(::getenv("DISPLAY")); // strip the screen number from the display display.remove(QRegularExpression(QStringLiteral("\\.\\d+$"))); int i;