diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2006-06-07 20:09:04 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2006-06-07 20:09:04 +0000 |
| commit | 19c5aee9339b60621797e8d382e0ea9ed176a424 (patch) | |
| tree | d405a4f1d78dd66b44d55e9e15be1b166ca2558e | |
| parent | 8243761c0822e0da20ae4915315c9c3559ad2b30 (diff) | |
| download | extra-cmake-modules-19c5aee9339b60621797e8d382e0ea9ed176a424.tar.gz extra-cmake-modules-19c5aee9339b60621797e8d382e0ea9ed176a424.tar.bz2 | |
-first check for qmake, then for qmake-qt4, this is in sync with cmake's FindQt4.cmake and better for us (as we use qt-copy)
Alex
svn path=/trunk/KDE/kdelibs/; revision=549218
| -rw-r--r-- | modules/FindQt4.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake index 98471763..82260528 100644 --- a/modules/FindQt4.cmake +++ b/modules/FindQt4.cmake @@ -172,7 +172,7 @@ IF (WIN32) ENDIF(WIN32) # check for qmake -FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake-qt4 qmake PATHS +FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake-qt4 PATHS "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin" "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin" $ENV{QTDIR}/bin |