summaryrefslogtreecommitdiff
path: root/.qmake.conf
diff options
context:
space:
mode:
authorKari Oikarinen <kari.oikarinen@qt.io>2019-01-08 08:19:26 +0200
committerKari Oikarinen <kari.oikarinen@qt.io>2019-01-08 08:19:26 +0200
commit71fc43384f54b8b1625c22f119b88fb83670b210 (patch)
tree1cf12b6af3cea3a01667481f74d3aa56ab8cc7f0 /.qmake.conf
parent1ceac50cf3bf42b5e852a0fd94688601ab68013d (diff)
parente567b9d8c8447f8d2bd35ab3184b956e95380222 (diff)
downloadqtwebsockets-71fc43384f54b8b1625c22f119b88fb83670b210.tar.gz
Merge 5.12 into 5.12.1
Change-Id: I7618d577bf71922ae6d41de1cdbc63116f6aa457
Diffstat (limited to '.qmake.conf')
-rw-r--r--.qmake.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/.qmake.conf b/.qmake.conf
index bc074d5..b9d358f 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.0
+MODULE_VERSION = 5.12.1