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

List:       kde-commits
Subject:    [krita/akamakin/T8628-multithreading-optimization] plugins/extensions/pykrita/sip: Fix PyQt5 check. 
From:       Andrey Kamakin <null () kde ! org>
Date:       2018-07-19 11:20:34
Message-ID: E1fg6z4-0005ss-GD () code ! kde ! org
[Download RAW message or body]

Git commit 7c8b81aa104d6c634c5c4b25650a6eb44b274f83 by Andrey Kamakin, on b=
ehalf of Victor W=C3=A5hlstr=C3=B6m.
Committed on 19/07/2018 at 11:14.
Pushed by akamakin into branch 'akamakin/T8628-multithreading-optimization'.

Fix PyQt5 check. Broke for version 5.10.1.

M  +1    -1    plugins/extensions/pykrita/sip/CMakeLists.txt

https://commits.kde.org/krita/7c8b81aa104d6c634c5c4b25650a6eb44b274f83

diff --git a/plugins/extensions/pykrita/sip/CMakeLists.txt b/plugins/extens=
ions/pykrita/sip/CMakeLists.txt
index 6186b140fb3..3fe903ceb7d 100644
--- a/plugins/extensions/pykrita/sip/CMakeLists.txt
+++ b/plugins/extensions/pykrita/sip/CMakeLists.txt
@@ -12,7 +12,7 @@ set(SIP_INCLUDES
     ${PYQT_SIP_DIR_OVERRIDE}
      ./krita)
 =

-if(${PYQT5_VERSION_STR} VERSION_GREATER "5.10.0")
+if(${PYQT5_VERSION_STR} VERSION_EQUAL "5.11.0" OR ${PYQT5_VERSION_STR} VER=
SION_GREATER "5.11.0")
     set(SIP_NAME -n PyQt5.sip)
 endif()
 =


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