diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-02 10:16:29 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-02 10:16:29 +0200 |
| commit | 45cd9f66f42c595ff429475170b6e623669363a6 (patch) | |
| tree | 13f53746664b16a2ca51d04a369d925edafcc3d6 /.qmake.conf | |
| parent | 962ea7072e3bd27f28102f2367288046f9c3994d (diff) | |
| parent | 5508cd19d17c2b2a94aef94be2b4dcdbb29377e8 (diff) | |
| download | qtactiveqt-45cd9f66f42c595ff429475170b6e623669363a6.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into devv5.8.0-alpha1
Conflicts:
.qmake.conf
Change-Id: Icba6315772d2c31eb30f02460b2b282d12b33d37
Diffstat (limited to '.qmake.conf')
| -rw-r--r-- | .qmake.conf | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.qmake.conf b/.qmake.conf index aa9ded0..aefa1e7 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,4 +1,3 @@ load(qt_build_config) -CONFIG += qt_example_installs MODULE_VERSION = 5.8.0 |