diff options
| author | Pierre Rossi <pierre.rossi@theqtcompany.com> | 2015-01-16 18:24:17 +0100 |
|---|---|---|
| committer | Pierre Rossi <pierre.rossi@theqtcompany.com> | 2015-01-16 18:24:17 +0100 |
| commit | 0fc1516692fb11f3489bce11a8f0cc15ad8f6b63 (patch) | |
| tree | d39aa29c33b87430598fe17751a7d65529792660 /tools/qmake/mkspecs/features/default_pre.prf | |
| parent | db2f69bb58ab369e44ea8bb30dcdbe90660578a2 (diff) | |
| parent | ae657b918ff22da2553dc577c877b03f49cc2bdf (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/3rdparty
Change-Id: Ied43de29444d4803218e250b096b9c72bc017af7
Diffstat (limited to 'tools/qmake/mkspecs/features/default_pre.prf')
| -rw-r--r-- | tools/qmake/mkspecs/features/default_pre.prf | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tools/qmake/mkspecs/features/default_pre.prf b/tools/qmake/mkspecs/features/default_pre.prf index aeb7c0b3b..02f4f24d4 100644 --- a/tools/qmake/mkspecs/features/default_pre.prf +++ b/tools/qmake/mkspecs/features/default_pre.prf @@ -9,8 +9,15 @@ QTWEBENGINEPROCESS_NAME = QtWebEngineProcess # Location of sync.profile MODULE_BASE_DIR = $$QTWEBENGINE_ROOT +EOL = $$escape_expand(\\n) load(functions) +# Check platform support and run config tests early enough to bail +equals(_PRO_FILE_, "$$QTWEBENGINE_ROOT/qtwebengine.pro"): isPlatformSupported() { + load(configure) + runConfigure() +} + # Call the original default_pre. load(default_pre) |