diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-29 16:03:31 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-29 16:03:31 +0100 |
| commit | 0a6191c01b6a855cb871286ac48c45d01b34310a (patch) | |
| tree | b89f2182025809a2b425df1a5256388b151eeddb /.qmake.conf | |
| parent | e376d9bb3a94d28c30c67baa7bc385baaf65a035 (diff) | |
| parent | be13521707249d4d89085e6e850944056ab923f7 (diff) | |
| download | qtlocation-0a6191c01b6a855cb871286ac48c45d01b34310a.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
Change-Id: I3c90652f618afcf6a5f26232558843b8e26d8164
Diffstat (limited to '.qmake.conf')
| -rw-r--r-- | .qmake.conf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.qmake.conf b/.qmake.conf index 16328b7d..efd0e68f 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,4 @@ load(qt_build_config) +CONFIG += qt_example_installs MODULE_VERSION = 5.3.0 |