diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-06-09 15:00:36 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-06-09 15:00:43 +0200 |
| commit | 6d9a7006e81fc9ef6140bfc62696d1b270aaae08 (patch) | |
| tree | d7ce8d417f32ab73543740beab3cdee36b4fdfaf /.qmake.conf | |
| parent | bde54c522b76eeb933296aa1a9e159facbf8e529 (diff) | |
| parent | 74916ede2ff34c2040db9cabbb5a6ee81442a7e8 (diff) | |
Merge remote-tracking branch 'gerrit/5.6' into 5.7
Change-Id: Id8dffff9bb75db396aabf6da2a3acb78505a6476
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 33a2710f..4ef70163 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,4 +1,3 @@ load(qt_build_config) -CONFIG += qt_example_installs MODULE_VERSION = 5.7.0 |