diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-17 12:33:53 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-17 12:33:53 +0200 |
commit | f582f7ecbd35d9825fc17ecc9c4bcca7b9cb28ac (patch) | |
tree | e9eadad9147abb934cf4471760f2bf4d6feee0e7 /.qmake.conf | |
parent | 30794c6737a1105bdcd840e41ff374ece3bc60e1 (diff) | |
parent | ba122ea95e89ec6f687b9f0386a017cf281bcc40 (diff) | |
download | qtwebsockets-f582f7ecbd35d9825fc17ecc9c4bcca7b9cb28ac.tar.gz |
Merge "Merge remote-tracking branch 'origin/5.12.4' into 5.12"
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 7e57b5b..48a283a 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -3,4 +3,4 @@ load(qt_build_config) CONFIG += warning_clean DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.12.3 +MODULE_VERSION = 5.12.4 |