diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-21 03:02:43 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-21 03:02:43 +0100 |
commit | 186cf6ec67c288e7f97d73c69fb49da6016d3d7b (patch) | |
tree | df5b0ede7a1c92106539ec0443bfa68689018be2 /.qmake.conf | |
parent | da883ade638a29c54030d0cbb0eabab8c524a875 (diff) | |
parent | c08c1267d491cb225c84fad4c7b77e5aa1b9ee4b (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Ib16212eb7206a9f8829609339fd2c6410e8d02b6
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 e578a2a..8289fa4 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION=5.14.0 +MODULE_VERSION=5.14.1 CMAKE_MODULE_TESTS=- |