From 65ad7ba830588ab2646783b1a0df58abc0c38e37 Mon Sep 17 00:00:00 2001 From: Clinton Stimpson Date: Sat, 5 Jul 2008 11:57:57 -0400 Subject: BUG: Watch for empty qconfig.pri files. Fixes #7287. --- Modules/FindQt4.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index 91983ed..da8594c 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -1343,9 +1343,9 @@ IF (QT4_QMAKE_FOUND) ####################################### IF(EXISTS "${QT_MKSPECS_DIR}/qconfig.pri") FILE(READ ${QT_MKSPECS_DIR}/qconfig.pri _qconfig_FILE_contents) - STRING(REGEX MATCH "QT_CONFIG[^\n]+" QT_QCONFIG ${_qconfig_FILE_contents}) - STRING(REGEX MATCH "CONFIG[^\n]+" QT_CONFIG ${_qconfig_FILE_contents}) - STRING(REGEX MATCH "EDITION[^\n]+" QT_EDITION ${_qconfig_FILE_contents}) + STRING(REGEX MATCH "QT_CONFIG[^\n]+" QT_QCONFIG "${_qconfig_FILE_contents}") + STRING(REGEX MATCH "CONFIG[^\n]+" QT_CONFIG "${_qconfig_FILE_contents}") + STRING(REGEX MATCH "EDITION[^\n]+" QT_EDITION "${_qconfig_FILE_contents}") ENDIF(EXISTS "${QT_MKSPECS_DIR}/qconfig.pri") IF("${QT_EDITION}" MATCHES "DesktopLight") SET(QT_EDITION_DESKTOPLIGHT 1) -- cgit v0.12