diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-29 14:48:57 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-29 14:50:02 +0200 |
| commit | ae2f2d2b92fbaa56d9557219a5696e700620f884 (patch) | |
| tree | 8fad3845aa9a746478479cbe7c02841a01ac4139 /.qmake.conf | |
| parent | 26229cfa0b729313893af5674d604e8692dbb946 (diff) | |
| parent | ed05a82cd52d2f84647ad1d46b242c619b2a14e3 (diff) | |
| download | qtquick1-ae2f2d2b92fbaa56d9557219a5696e700620f884.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
.qmake.conf
Change-Id: Iba1819a7e10957f4bb5be90852747a4b459a3172
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 33a2710f..6b42ddf9 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.7.0 |