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

List:       kde-commits
Subject:    [breeze/Plasma/5.14] kstyle: Fix finding QtQuick
From:       Kai Uwe Broulik <null () kde ! org>
Date:       2018-09-17 8:11:48
Message-ID: E1g1odI-0001yH-44 () code ! kde ! org
[Download RAW message or body]

Git commit 3e8eac8fc461e35614c3f297fb1ac99ad1c18e53 by Kai Uwe Broulik.
Committed on 17/09/2018 at 08:11.
Pushed by broulik into branch 'Plasma/5.14'.

Fix finding QtQuick

It is QtQuick_FOUND, not Qt_Quick_FOUND. This broke all special-casings for=
 QtQuick,
such as "drag on empty area" in QtQuick windows and ComboBox popups.

BUG: 398663
FIXED-IN: 5.14.0

Differential Revision: https://phabricator.kde.org/D15568

M  +2    -2    kstyle/CMakeLists.txt

https://commits.kde.org/breeze/3e8eac8fc461e35614c3f297fb1ac99ad1c18e53

diff --git a/kstyle/CMakeLists.txt b/kstyle/CMakeLists.txt
index 3ee936cb..2b061acf 100644
--- a/kstyle/CMakeLists.txt
+++ b/kstyle/CMakeLists.txt
@@ -42,7 +42,7 @@ else()
       WindowSystem)
 =

   find_package(Qt5 COMPONENTS Quick)
-  set(BREEZE_HAVE_QTQUICK ${Qt5_Quick_FOUND})
+  set(BREEZE_HAVE_QTQUICK ${Qt5Quick_FOUND})
 =

   find_package( KF5FrameworkIntegration CONFIG )
   set_package_properties(KF5FrameworkIntegration PROPERTIES
@@ -160,7 +160,7 @@ else()
   kconfig_add_kcfg_files(breeze_PART_SRCS breezestyleconfigdata.kcfgc)
   add_library(breeze MODULE ${breeze_PART_SRCS})
   target_link_libraries(breeze Qt5::Core Qt5::Gui Qt5::Widgets Qt5::DBus)
-  if( Qt5_Quick_FOUND )
+  if( BREEZE_HAVE_QTQUICK )
     target_link_libraries(breeze Qt5::Quick)
   endif()
   target_link_libraries(breeze KF5::ConfigCore KF5::ConfigWidgets KF5::Gui=
Addons KF5::WindowSystem)
[prev in list] [next in list] [prev in thread] [next in thread]