diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-05-31 11:33:19 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-05-31 11:33:53 +0200 |
| commit | d2d5d24f86f12a2d1b0a6bc46c0d48306d7d2130 (patch) | |
| tree | d67555a6c699c49a89ea10863b6c0e4c0c3f5cae /tools/qmake | |
| parent | f9e951d0946fe0fcd51e9015108f92c46ecc8138 (diff) | |
| parent | 42d864c86d8c85db7b2d42f8505d962a642e4c77 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I561c00b3a844ab493a5bf0148a5923662842cf5d
Diffstat (limited to 'tools/qmake')
| -rw-r--r-- | tools/qmake/mkspecs/features/configure.prf | 5 | ||||
| -rw-r--r-- | tools/qmake/mkspecs/features/functions.prf | 12 |
2 files changed, 8 insertions, 9 deletions
diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf index 8c58b8e3f..7ef4b8545 100644 --- a/tools/qmake/mkspecs/features/configure.prf +++ b/tools/qmake/mkspecs/features/configure.prf @@ -117,6 +117,11 @@ defineTest(finalizeConfigure) { } else { log("Proprietary codecs (H264, MP3).... Not enabled (Default, enable with WEBENGINE_CONFIG+=use_proprietary_codecs)$${EOL}") } + qtHaveModule(positioning): { + log("Geolocation....................... Enabled$${EOL}") + } else { + log("Geolocation....................... Not enabled (Requires Qt Positioning module)$${EOL}") + } osx { use?(appstore_compliant_code) { log("AppStore Compliant ............... Enabled$${EOL}") diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf index 26db26f44..9e8886e86 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf @@ -149,19 +149,13 @@ defineReplace(extractCFlag) { } defineReplace(findMocables) { - input = $$1 - for (file, input): \ - infiles += $$absolute_path($$file, $$_PRO_FILE_PWD_) - mocables = $$system("python $$QTWEBENGINE_ROOT/tools/buildscripts/find-mocables $$infiles") - mocables = $$replace(mocables, $$re_escape($${_PRO_FILE_PWD_}/), '') + mocables = $$system("$$system_path(python $$QTWEBENGINE_ROOT/tools/buildscripts/find-mocables $$_PRO_FILE_PWD_ $$1)") + mocables = $$replace(mocables, $$re_escape($$system_path($${_PRO_FILE_PWD_}/)), '') return($$mocables) } defineReplace(findIncludedMocFiles) { - input = $$1 - for (file, input): \ - infiles += $$absolute_path($$file, $$_PRO_FILE_PWD_) - return($$system("python $$QTWEBENGINE_ROOT/tools/buildscripts/find-included-moc-files $$infiles")) + return($$system("$$system_path(python $$QTWEBENGINE_ROOT/tools/buildscripts/find-included-moc-files $$_PRO_FILE_PWD_ $$1)")) } defineReplace(mocOutput) { |