summaryrefslogtreecommitdiff
path: root/.qmake.conf
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-06-17 12:32:26 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-06-17 12:32:26 +0200
commit30c3d66fd5be3acc80e7ba1d2399c7a43624c3c8 (patch)
tree220d0201b5bf05180afb0f2f0115e95713e7207a /.qmake.conf
parent0f74e642bf1f13f6b097b1a8e1412ca3cb6e85b5 (diff)
parent8105e3ed0e77f363ccc6406edd38082ac5cef27d (diff)
downloadqtquickcontrols-30c3d66fd5be3acc80e7ba1d2399c7a43624c3c8.tar.gz
Merge remote-tracking branch 'origin/5.12.4' into 5.12
Change-Id: I19610f79e1fd1f4b3033e6b11a3fef1f55c03a62
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 b47ca20b..bc353b73 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -2,4 +2,4 @@ load(qt_build_config)
CONFIG += warning_clean
android|ios|qnx|isEmpty(QT.widgets.name): CONFIG += no_desktop
-MODULE_VERSION = 5.12.3
+MODULE_VERSION = 5.12.4