diff options
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/device_config.prf | 2 | ||||
| -rw-r--r-- | mkspecs/features/qt_config.prf | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/mkspecs/features/device_config.prf b/mkspecs/features/device_config.prf index 7da3fe5..aa0aa50 100644 --- a/mkspecs/features/device_config.prf +++ b/mkspecs/features/device_config.prf @@ -1,5 +1,5 @@ # Load generated qdevice.pri -isEmpty(QT_BUILD_TREE): QT_BUILD_TREE = $$fromfile($$_QMAKE_CACHE_, QT_BUILD_TREE) +isEmpty(QT_BUILD_TREE):exists($$_QMAKE_CACHE_): QT_BUILD_TREE = $$fromfile($$_QMAKE_CACHE_, QT_BUILD_TREE) isEmpty(QT_BUILD_TREE): QT_BUILD_TREE = $$[QT_INSTALL_DATA] DEVICE_PRI = $$QT_BUILD_TREE/mkspecs/qdevice.pri diff --git a/mkspecs/features/qt_config.prf b/mkspecs/features/qt_config.prf index de1cac4..4575f4a 100644 --- a/mkspecs/features/qt_config.prf +++ b/mkspecs/features/qt_config.prf @@ -3,11 +3,11 @@ exists($$_QMAKE_CACHE_):QMAKE_QT_CONFIG = $$fromfile($$_QMAKE_CACHE_, QMAKE_QT_CONFIG) isEmpty(QMAKE_QT_CONFIG)|!exists($$QMAKE_QT_CONFIG) { - !isEmpty(QT_BUILD_TREE):QMAKE_QT_CONFIG = $$QT_BUILD_TREE/mkspecs/qconfig.pri - else:exists($$_QMAKE_CACHE_):infile($$_QMAKE_CACHE_, QT_BUILD_TREE):QMAKE_QT_CONFIG = $$fromfile($$_QMAKE_CACHE_, QT_BUILD_TREE)/mkspecs/qconfig.pri - else:exists($$[QT_INSTALL_DATA]/mkspecs/qconfig.pri):QMAKE_QT_CONFIG = $$[QT_INSTALL_DATA]/mkspecs/qconfig.pri + isEmpty(QT_BUILD_TREE):exists($$_QMAKE_CACHE_): QT_BUILD_TREE = $$fromfile($$_QMAKE_CACHE_, QT_BUILD_TREE) + isEmpty(QT_BUILD_TREE): QT_BUILD_TREE = $$[QT_INSTALL_DATA] + QMAKE_QT_CONFIG = $$QT_BUILD_TREE/mkspecs/qconfig.pri } -!exists($$QMAKE_QT_CONFIG)|!include($$QMAKE_QT_CONFIG, "", true) { +!include($$QMAKE_QT_CONFIG, "", true) { debug(1, "Cannot load qconfig.pri!") } else { debug(1, "Loaded .qconfig.pri from ($$QMAKE_QT_CONFIG)") |