diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-09-06 01:37:10 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-09-06 01:38:39 +0200 |
| commit | ea82d7704dee327def5c49633a1f3c3eddd4b1db (patch) | |
| tree | 1f4b6e8bbd9cf75a0148b4f2d5e49931f2e73277 /.qmake.conf | |
| parent | 119db3c806220038ba3a10bc9dc0b4afb1e3bfbf (diff) | |
| parent | 1b5a69309d2702b8339c9829f86ea685ca4ad903 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Adjusted .qmake.conf to point to 5.7.0 for the dev branch.
Change-Id: I4798e8557ae17231b64e1e5ba0db6b93270debba
Diffstat (limited to '.qmake.conf')
| -rw-r--r-- | .qmake.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.qmake.conf b/.qmake.conf index 775d98c..1fe224d 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION=5.6.0 +MODULE_VERSION=5.7.0 |