diff options
Diffstat (limited to 'x11-themes/Kvantum/files/patch-style_themeconfig_ThemeConfig.cpp')
| -rw-r--r-- | x11-themes/Kvantum/files/patch-style_themeconfig_ThemeConfig.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/x11-themes/Kvantum/files/patch-style_themeconfig_ThemeConfig.cpp b/x11-themes/Kvantum/files/patch-style_themeconfig_ThemeConfig.cpp index 0f9b78ecb770..382b634d1a31 100644 --- a/x11-themes/Kvantum/files/patch-style_themeconfig_ThemeConfig.cpp +++ b/x11-themes/Kvantum/files/patch-style_themeconfig_ThemeConfig.cpp @@ -1,4 +1,4 @@ ---- style/themeconfig/ThemeConfig.cpp.orig 2019-02-08 18:10:24 UTC +--- style/themeconfig/ThemeConfig.cpp.orig 2019-07-30 23:05:10 UTC +++ style/themeconfig/ThemeConfig.cpp @@ -19,7 +19,7 @@ #include <QFile> @@ -7,7 +7,7 @@ -#if defined Q_WS_X11 || defined Q_OS_LINUX +#if defined Q_WS_X11 || defined Q_OS_LINUX || defined Q_OS_FREEBSD #include <QX11Info> - #if QT_VERSION >= 0x050000 + #if (QT_VERSION >= QT_VERSION_CHECK(5,0,0)) #include <X11/Xlib.h> @@ -37,7 +37,7 @@ ThemeConfig::ThemeConfig(const QString& theme) : { @@ -15,15 +15,15 @@ Later, a better method should be found. */ -#if defined Q_WS_X11 || defined Q_OS_LINUX +#if defined Q_WS_X11 || defined Q_OS_LINUX || defined Q_OS_FREEBSD - #if QT_VERSION < 0x050200 - isX11_ = true; + #if (QT_VERSION >= QT_VERSION_CHECK(5,2,0)) + isX11_ = QX11Info::isPlatformX11(); #else -@@ -544,7 +544,7 @@ theme_spec ThemeConfig::getCompositeSpec() - default_theme_spec(r); - QVariant v; +@@ -549,7 +549,7 @@ theme_spec ThemeConfig::getCompositeSpec() + { + bool compositing(false); -#if defined Q_WS_X11 || defined Q_OS_LINUX +#if defined Q_WS_X11 || defined Q_OS_LINUX || defined Q_OS_FREEBSD /* set to false if no compositing manager is running */ - #if QT_VERSION < 0x050200 - if (QX11Info::isCompositingManagerRunning()) + #if (QT_VERSION >= QT_VERSION_CHECK(5,2,0)) + if (isX11_) |