|
@@ -1,10 +1,7 @@
|
|
-From 45ec86156819c0872d023b05001682a8d2d2dc25 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 254858bbf443bded2e80480e9f9032ce166b923e Mon Sep 17 00:00:00 2001
|
|
From: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
|
|
From: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
|
|
-Date: Sat, 6 Apr 2013 16:54:25 +0200
|
|
|
|
-Subject: [PATCH] fix Qt4 package error in CMakeLists.txt
|
|
|
|
-
|
|
|
|
-Avoid checking for uic executable by cmake as it results configure
|
|
|
|
-time error if QtGui isn't installed.
|
|
|
|
|
|
+Date: Fri, 2 Dec 2016 23:00:58 +0100
|
|
|
|
+Subject: [PATCH] CMake, Qt4: check specifically for QtCore, fixes #96
|
|
|
|
|
|
Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
|
|
Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
|
|
---
|
|
---
|
|
@@ -12,18 +9,18 @@ Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
-index adb65e9..81854b1 100644
|
|
|
|
|
|
+index 31d9987..2fde79f 100755
|
|
--- a/CMakeLists.txt
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
-@@ -52,7 +52,7 @@ IF (Qt5Core_FOUND)
|
|
|
|
|
|
+@@ -62,7 +62,7 @@ IF (Qt5Core_FOUND)
|
|
ELSE()
|
|
ELSE()
|
|
MESSAGE ("Qt5 not found, searching for Qt4")
|
|
MESSAGE ("Qt5 not found, searching for Qt4")
|
|
# Find Qt4
|
|
# Find Qt4
|
|
-- FIND_PACKAGE( Qt4 REQUIRED )
|
|
|
|
-+ FIND_PACKAGE( Qt4 COMPONENTS QtCore REQUIRED )
|
|
|
|
-
|
|
|
|
- # Include the cmake file needed to use qt4
|
|
|
|
- INCLUDE( ${QT_USE_FILE} )
|
|
|
|
|
|
+- FIND_PACKAGE( Qt4 4.5 REQUIRED )
|
|
|
|
++ FIND_PACKAGE( Qt4 4.5 REQUIRED QtCore)
|
|
|
|
+ # QStringBuilder is supported since Qt 4.8 for both QString and QByteArray
|
|
|
|
+ IF (NOT (${QT_VERSION_MINOR} STRLESS "8"))
|
|
|
|
+ MESSAGE ("Enable QStringBuilder")
|
|
--
|
|
--
|
|
-2.1.1
|
|
|
|
|
|
+2.7.4
|
|
|
|
|