diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-08-30 09:50:50 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-08-30 09:50:50 +0200 |
| commit | 1b65a5d73a8e3a411093f4c0f1f4803eb2d08e54 (patch) | |
| tree | 3669e803153df25221aaeaa81500711fb7ba4fab /qt.pro | |
| parent | e89420945f368ec7b6d03b8aeb6e6b478ee960fe (diff) | |
| parent | 5a2a93ddf48465f37c116ef93f66682d789a61fc (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
coin/platform_configs/default.txt
coin/platform_configs/qt5.txt
Change-Id: Iaae974fbfad9130ead96d229829ab472c998e098
Diffstat (limited to 'qt.pro')
| -rw-r--r-- | qt.pro | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -1,5 +1,7 @@ # Create the super cache so modules will add themselves to it. -cache(, super) +# Also suppress the license check on subsequent "visits". The first +# visit will skip it anyway due to not having a compiler set up yet. +cache(CONFIG, add super, $$list(QTDIR_build)) TEMPLATE = subdirs |