Merge branch 'Plasma/5.15'

7 years ago · 52fbaf72ab
parent 080c599922 c534fdf1ba
commit 52fbaf72ab
6 changed files with 6 additions and 6 deletions
--- a/appmenu/appmenu.cpp
+++ b/appmenu/appmenu.cpp
@ -106,7 +106,7 @@ AppMenuModule::~AppMenuModule() = default;

 void AppMenuModule::slotWindowRegistered(WId id, const QString &serviceName, const QDBusObjectPath &menuObjectPath)
 {
-#ifdef HAVE_X11
+#if HAVE_X11
    if (KWindowSystem::isPlatformX11()) {
        auto *c = QX11Info::connection();

--- a/config-X11.h.cmake
+++ b/config-X11.h.cmake
@ -41,4 +41,4 @@
 #cmakedefine HAS_RANDR_1_3 1

 /* Define if you have X11 at all */
-#define HAVE_X11 ${X11_FOUND}
+#cmakedefine01 HAVE_X11
--- a/libkworkspace/config-libkworkspace.h.cmake
+++ b/libkworkspace/config-libkworkspace.h.cmake
@ -1,2 +1,2 @@
 /* Define if you have X11 at all */
-#define HAVE_X11 ${X11_FOUND}
+#cmakedefine01 HAVE_X11
--- a/runners/windows/config-windowsrunner.h.cmake
+++ b/runners/windows/config-windowsrunner.h.cmake
@ -1,2 +1,2 @@
 /* Define if you have X11 at all */
-#define HAVE_X11 ${X11_FOUND}
+#cmakedefine01 HAVE_X11
--- a/shell/scripting/appinterface.cpp
+++ b/shell/scripting/appinterface.cpp
@ -37,7 +37,7 @@
 #include <windows.h>
 #endif

-#ifdef HAVE_X11
+#if HAVE_X11
 #include <X11/Xlib.h>
 #include <fixx11h.h>
 #endif
--- a/soliduiserver/soliduiserver.cpp
+++ b/soliduiserver/soliduiserver.cpp
@ -219,7 +219,7 @@ void SolidUiServer::reparentDialog(QWidget *dialog, WId wId, const QString &appI

    KWindowSystem::setMainWindow(dialog, wId); // correct, set dialog parent

-#ifdef HAVE_X11
+#if HAVE_X11
    if (modal) {
        KWindowSystem::setState(dialog->winId(), NET::Modal);
    } else {