[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [qtcurve] qt5: Minor X11-related build fixes:
From:       R.J.V. Bertin <null () kde ! org>
Date:       2018-04-03 16:22:38
Message-ID: E1f3Ohi-0006aI-Ai () code ! kde ! org
[Download RAW message or body]

Git commit 9aae21bb68308d9017977a53059dd75b347d7bbd by R.J.V. Bertin.
Committed on 03/04/2018 at 16:18.
Pushed by rjvbb into branch 'master'.

Minor X11-related build fixes:

- don't override QTC_ENABLE_X11 with platform conditionals
- use qtcX11Enabled() instead of QTC_ENABLE_X11 everywhere

Committed from host : Portia.local

M  +1    -1    qt5/CMakeLists.txt
M  +4    -3    qt5/config/qtcurveconfig.cpp

https://commits.kde.org/qtcurve/9aae21bb68308d9017977a53059dd75b347d7bbd

diff --git a/qt5/CMakeLists.txt b/qt5/CMakeLists.txt
index 930c9199..8cff198f 100644
--- a/qt5/CMakeLists.txt
+++ b/qt5/CMakeLists.txt
@@ -36,7 +36,7 @@ if(ENABLE_QT5)
     set(QTC_QT5_DEFS ${QTC_QT5_DEFS} ${${QtModule}_DEFINITIONS})
     set(QTC_QT5_INCLUDES ${QTC_QT5_INCLUDES} ${${QtModule}_INCLUDE_DIRS})
   endforeach()
-  if(NOT APPLE)
+  if(QTC_ENABLE_X11)
     set(QTC_QT5_OPT_MODULES Qt5X11Extras)
   endif()
   foreach(QtModule ${QTC_QT5_OPT_MODULES})
diff --git a/qt5/config/qtcurveconfig.cpp b/qt5/config/qtcurveconfig.cpp
index b320c255..a34f9bd2 100644
--- a/qt5/config/qtcurveconfig.cpp
+++ b/qt5/config/qtcurveconfig.cpp
@@ -42,6 +42,7 @@
 #include <qtcurve-utils/dirs.h>
 #include <qtcurve-utils/process.h>
 #include <qtcurve-utils/qtutils.h>
+#include <qtcurve-utils/x11base.h>
 =

 // Qt
 #include <QCheckBox>
@@ -975,9 +976,9 @@ QtCurveConfig::QtCurveConfig(QWidget *parent)
     dropShadowSize->setRange(0, 100);
     dropShadowSize->setSingleStep(1);
     dropShadowSize->setValue(qtcX11ShadowSize());
-#ifndef QTC_ENABLE_X11
-    dropShadowSize->setEnabled(false);
-#endif
+    if (!qtcX11Enabled()) {
+        dropShadowSize->setEnabled(false);
+    }
 =

 =

     sliderWidth->setRange(MIN_SLIDER_WIDTH, MAX_SLIDER_WIDTH);
[prev in list] [next in list] [prev in thread] [next in thread]