diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2019-08-23 18:23:00 +0200 |
|---|---|---|
| committer | Jörg Bornemann <joerg.bornemann@qt.io> | 2019-09-19 04:12:20 +0000 |
| commit | 4d1d6fbea5ba80efde7f62532d7c73532361cea9 (patch) | |
| tree | 5dc7921ea1924800361972e451d9619bc6d682d6 /qtwebengine.pro | |
| parent | a7f0c31e65034f997513625e3653c1164bfef5ce (diff) | |
FIXUP: Fix platforms check for topLevel build
In case of a top level build configure.pri is not able
to load platform.prf. Move platform.prf to platfrom.pri
and use include instead. Fix not loaded qconfig.pri
with gcc versions. Make sure there is no function name
collision.
Change-Id: I2c9994197dc56371fd7ef215ab350aebb89ff701
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'qtwebengine.pro')
| -rw-r--r-- | qtwebengine.pro | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/qtwebengine.pro b/qtwebengine.pro index 6d4089b26..dae059a40 100644 --- a/qtwebengine.pro +++ b/qtwebengine.pro @@ -1,6 +1,5 @@ load(qt_parts) load(functions) -load(platform) QMAKE_DISTCLEAN += .qmake.cache |