summaryrefslogtreecommitdiff
path: root/.qmake.conf
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@theqtcompany.com>2016-05-26 13:25:02 +0200
committerAlex Blasche <alexander.blasche@theqtcompany.com>2016-05-26 13:25:02 +0200
commit4a5e6d6e8b816ac2dd8c673feb56a0af096a4a18 (patch)
tree64db1f3d677ee225ed6c919355882cc7a88497a7 /.qmake.conf
parentd1b708cde9428928b9f5c59c099f2deb584efd5f (diff)
parent55414e7ff710b5ca43f248d0609a15fc6cbe24ff (diff)
downloadqtlocation-4a5e6d6e8b816ac2dd8c673feb56a0af096a4a18.tar.gz
Merge branch '5.6' into 5.7
Change-Id: If8d408079ba6cceffd516c0ed95a21a2ca1ca2a0
Diffstat (limited to '.qmake.conf')
-rw-r--r--.qmake.conf3
1 files changed, 1 insertions, 2 deletions
diff --git a/.qmake.conf b/.qmake.conf
index 33a2710f..a2a0d418 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,4 +1,3 @@
load(qt_build_config)
-CONFIG += qt_example_installs
-MODULE_VERSION = 5.7.0
+MODULE_VERSION = 5.7.1