diff options
Diffstat (limited to 'mkspecs/features/qt_configure.prf')
| -rw-r--r-- | mkspecs/features/qt_configure.prf | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf index c3ea334dd8..afeb4f3d1d 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -492,8 +492,8 @@ defineTest(qtConfSetupLibraries) { # overrides from the command line are accepted. defineTest(qtConfLibrary_inline) { lib = $$eval($${1}.library) - !defined($${1}.libs, var): \ - error("'inline' source in library '$$lib' does not specify 'libs'.") + !defined($${1}.libs, var):isEmpty($${1}.builds._KEYS_): \ + error("'inline' source in library '$$lib' specifies neither 'libs' nor 'builds'.") # if multiple libraries provide the same export, it makes sense # to make them recognize the same input variables. @@ -2028,10 +2028,7 @@ for (currentConfig, allConfigs) { } qtConfCheckErrors() -!isEmpty(_QMAKE_SUPER_CACHE_): \ - QMAKE_CONFIG_CACHE = $$dirname(_QMAKE_SUPER_CACHE_)/config.cache -else: \ - QMAKE_CONFIG_CACHE = $$dirname(_QMAKE_CACHE_)/config.cache +QMAKE_CONFIG_CACHE = $$OUT_PWD/config.cache QMAKE_CONFIG_CACHE_USE = $$eval(config.input.cache_use) isEmpty(QMAKE_CONFIG_CACHE_USE): \ QMAKE_CONFIG_CACHE_USE = all |