diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-01-16 18:10:43 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-01-16 18:10:43 +0100 |
| commit | e66a1125f2b796fe48aef6c88caf501ee3224c0f (patch) | |
| tree | d28115677f56722248bd564e063df96f0f166685 /tools/qmake/mkspecs/features/default_pre.prf | |
| parent | 79773ecfcc27b350a3e5ea1149ef51f7cc657b61 (diff) | |
| parent | ae657b918ff22da2553dc577c877b03f49cc2bdf (diff) | |
Merge 5.4 into 5.4.1
Change-Id: I772c9710d8b01efd385a54e5f642ae2b62702a0e
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) |