35 lines
1.3 KiB
Diff
35 lines
1.3 KiB
Diff
|
From cfba5ef111bf86e8820a4dff556b3a9edc1484cd Mon Sep 17 00:00:00 2001
|
||
|
|
From: Clinton Stimpson <clinton@elemtech.com>
|
||
|
|
Date: Fri, 15 Oct 2010 16:36:14 -0600
|
||
|
|
Subject: [PATCH] Fix regression in 2dae2f1 which added find of Qt imports dir.
|
||
|
|
|
||
|
|
---
|
||
|
|
Modules/FindQt4.cmake | 4 ++--
|
||
|
|
1 files changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
|
||
|
|
index 45bbd2e..6129329 100644
|
||
|
|
--- a/Modules/FindQt4.cmake
|
||
|
|
+++ b/Modules/FindQt4.cmake
|
||
|
|
@@ -482,7 +482,7 @@ IF (QT_QMAKE_EXECUTABLE)
|
||
|
|
_qt4_query_qmake(QT_VERSION QTVERSION)
|
||
|
|
|
||
|
|
# check for qt3 qmake and then try and find qmake4 or qmake-qt4 in the path
|
||
|
|
- IF("${QTVERSION}" MATCHES "Unknown")
|
||
|
|
+ IF(NOT QTVERSION)
|
||
|
|
SET(QT_QMAKE_EXECUTABLE NOTFOUND CACHE FILEPATH "" FORCE)
|
||
|
|
FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 PATHS
|
||
|
|
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
|
||
|
|
@@ -493,7 +493,7 @@ IF (QT_QMAKE_EXECUTABLE)
|
||
|
|
IF(QT_QMAKE_EXECUTABLE)
|
||
|
|
_qt4_query_qmake(QT_VERSION QTVERSION)
|
||
|
|
ENDIF(QT_QMAKE_EXECUTABLE)
|
||
|
|
- ENDIF("${QTVERSION}" MATCHES "Unknown")
|
||
|
|
+ ENDIF(NOT QTVERSION)
|
||
|
|
|
||
|
|
# check that we found the Qt4 qmake, Qt3 qmake output won't match here
|
||
|
|
STRING(REGEX MATCH "^[0-9]+\\.[0-9]+\\.[0-9]+" qt_version_tmp "${QTVERSION}")
|
||
|
|
--
|
||
|
|
1.7.0
|
||
|
|
|