diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-01 09:16:51 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-01 09:16:51 +0200 |
| commit | 2523056490c3f7a35d176deb583ba46899fe260b (patch) | |
| tree | 0a38f955248b467227e4fca5aa6e161472cec2b2 /.qmake.conf | |
| parent | 1533ffc6d8afe46df72a05ecd571fd7dcb1bd397 (diff) | |
| parent | 4d4a9609fab58da304e4c13b9a37531116a4fadb (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.1
Conflicts:
src/datavisualization/datavisualization.pro
Change-Id: Ie79d1c1e959bac9a674a9031c36e7914252805b9
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 89028e77..45d6a30c 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,5 +1,4 @@ load(qt_build_config) -CONFIG += qt_example_installs MODULE_VERSION = 5.7.1 |