diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-20 11:09:27 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-20 11:09:36 +0100 |
| commit | 552624b40f1af790bf747f52754895314d563f1d (patch) | |
| tree | d2565e1a8799ba889b3ffd398456de34656aa6fc | |
| parent | 7ca1503ab72292552e110abb5d36de95fb1969c0 (diff) | |
| parent | 4594e8b48ffa8cf4245c4040e3d6d28aaf9cd5cf (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: Idb0ac6490d6faf843acccc11ce68604a878d9ecd
| -rw-r--r-- | tools/qmake/mkspecs/features/default_pre.prf | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/qmake/mkspecs/features/default_pre.prf b/tools/qmake/mkspecs/features/default_pre.prf index 02f4f24d4..2e556c2a6 100644 --- a/tools/qmake/mkspecs/features/default_pre.prf +++ b/tools/qmake/mkspecs/features/default_pre.prf @@ -11,6 +11,8 @@ MODULE_BASE_DIR = $$QTWEBENGINE_ROOT EOL = $$escape_expand(\\n) +# Call the original default_pre. +load(default_pre) load(functions) # Check platform support and run config tests early enough to bail @@ -18,6 +20,3 @@ equals(_PRO_FILE_, "$$QTWEBENGINE_ROOT/qtwebengine.pro"): isPlatformSupported() load(configure) runConfigure() } - -# Call the original default_pre. -load(default_pre) |