diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-07-01 20:28:27 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-07-01 20:28:38 +0200 |
| commit | 64faeb0d8003e699a4d09e7dcee1ef6eb10302ad (patch) | |
| tree | 6dcbca91651e373e045181a82a8c8c2a380f8f8a /.qmake.conf | |
| parent | 92c847e56d94c9032f3fa83922742e455233e4f3 (diff) | |
| parent | 857fc5ec4644a6111ba8725e4e1a84dd5ea6bfca (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
.qmake.conf
Change-Id: I39ab590ec2c95b3c213e90dad5a8f5e3e626baab
Diffstat (limited to '.qmake.conf')
| -rw-r--r-- | .qmake.conf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.qmake.conf b/.qmake.conf index aa9ded07..345595a4 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,4 +1,5 @@ load(qt_build_config) -CONFIG += qt_example_installs +# Pretend that the example installs are not FUBAR. +CONFIG += install_ok MODULE_VERSION = 5.8.0 |