Merge remote branch 'origin/master' into refactor

Conflicts:
	src/modules/qt_openvg.pri
	src/widgets/to_be_moved/qlinecontrol_p.h

10 files changed, 30 insertions, 30 deletions

diff --git a/src/modules/qt_core.pri b/src/modules/qt_core.pri
index bf013432a5..e6e5df9d27 100644
--- a/src/modules/qt_core.pri
+++ b/src/modules/qt_core.pri
@@ -1,6 +1,6 @@
-QT.core.VERSION = 4.8.0
-QT.core.MAJOR_VERSION = 4
-QT.core.MINOR_VERSION = 8
+QT.core.VERSION = 5.0.0
+QT.core.MAJOR_VERSION = 5
+QT.core.MINOR_VERSION = 0
 QT.core.PATCH_VERSION = 0
 
 QT.core.name = QtCore
diff --git a/src/modules/qt_dbus.pri b/src/modules/qt_dbus.pri
index 9aefab9b82..d57160eb77 100644
--- a/src/modules/qt_dbus.pri
+++ b/src/modules/qt_dbus.pri
@@ -1,6 +1,6 @@
-QT.dbus.VERSION = 4.8.0
-QT.dbus.MAJOR_VERSION = 4
-QT.dbus.MINOR_VERSION = 8
+QT.dbus.VERSION = 5.0.0
+QT.dbus.MAJOR_VERSION = 5
+QT.dbus.MINOR_VERSION = 0
 QT.dbus.PATCH_VERSION = 0
 
 QT.dbus.name = QtDBus
diff --git a/src/modules/qt_gui.pri b/src/modules/qt_gui.pri
index 1ef3697db6..0d1b2109f8 100644
--- a/src/modules/qt_gui.pri
+++ b/src/modules/qt_gui.pri
@@ -1,6 +1,6 @@
-QT.gui.VERSION = 4.8.0
-QT.gui.MAJOR_VERSION = 4
-QT.gui.MINOR_VERSION = 8
+QT.gui.VERSION = 5.0.0
+QT.gui.MAJOR_VERSION = 5
+QT.gui.MINOR_VERSION = 0
 QT.gui.PATCH_VERSION = 0
 
 QT.gui.name = QtGui
diff --git a/src/modules/qt_network.pri b/src/modules/qt_network.pri
index 44326c2b2d..76b462286f 100644
--- a/src/modules/qt_network.pri
+++ b/src/modules/qt_network.pri
@@ -1,6 +1,6 @@
-QT.network.VERSION = 4.8.0
-QT.network.MAJOR_VERSION = 4
-QT.network.MINOR_VERSION = 8
+QT.network.VERSION = 5.0.0
+QT.network.MAJOR_VERSION = 5
+QT.network.MINOR_VERSION = 0
 QT.network.PATCH_VERSION = 0
 
 QT.network.name = QtNetwork
diff --git a/src/modules/qt_opengl.pri b/src/modules/qt_opengl.pri
index a1080cb5a5..22476cf949 100644
--- a/src/modules/qt_opengl.pri
+++ b/src/modules/qt_opengl.pri
@@ -1,6 +1,6 @@
-QT.opengl.VERSION = 4.8.0
-QT.opengl.MAJOR_VERSION = 4
-QT.opengl.MINOR_VERSION = 8
+QT.opengl.VERSION = 5.0.0
+QT.opengl.MAJOR_VERSION = 5
+QT.opengl.MINOR_VERSION = 0
 QT.opengl.PATCH_VERSION = 0
 
 QT.opengl.name = QtOpenGL
diff --git a/src/modules/qt_sql.pri b/src/modules/qt_sql.pri
index 14d2422989..02f48d2a6b 100644
--- a/src/modules/qt_sql.pri
+++ b/src/modules/qt_sql.pri
@@ -1,6 +1,6 @@
-QT.sql.VERSION = 4.8.0
-QT.sql.MAJOR_VERSION = 4
-QT.sql.MINOR_VERSION = 8
+QT.sql.VERSION = 5.0.0
+QT.sql.MAJOR_VERSION = 5
+QT.sql.MINOR_VERSION = 0
 QT.sql.PATCH_VERSION = 0
 
 QT.sql.name = QtSql
diff --git a/src/modules/qt_testlib.pri b/src/modules/qt_testlib.pri
index 9fd9b2e446..923fb27df3 100644
--- a/src/modules/qt_testlib.pri
+++ b/src/modules/qt_testlib.pri
@@ -1,6 +1,6 @@
-QT.testlib.VERSION = 4.8.0
-QT.testlib.MAJOR_VERSION = 4
-QT.testlib.MINOR_VERSION = 8
+QT.testlib.VERSION = 5.0.0
+QT.testlib.MAJOR_VERSION = 5
+QT.testlib.MINOR_VERSION = 0
 QT.testlib.PATCH_VERSION = 0
 
 QT.testlib.name = QtTest
diff --git a/src/modules/qt_uilib.pri b/src/modules/qt_uilib.pri
index 5973216921..04616ac6af 100644
--- a/src/modules/qt_uilib.pri
+++ b/src/modules/qt_uilib.pri
@@ -1,6 +1,6 @@
-QT.uilib.VERSION = 4.8.0
-QT.uilib.MAJOR_VERSION = 4
-QT.uilib.MINOR_VERSION = 8
+QT.uilib.VERSION = 5.0.0
+QT.uilib.MAJOR_VERSION = 5
+QT.uilib.MINOR_VERSION = 0
 QT.uilib.PATCH_VERSION = 0
 
 QT.uilib.name = QtUiLib
diff --git a/src/modules/qt_uitools.pri b/src/modules/qt_uitools.pri
index d30c8b845b..128a20cfd7 100644
--- a/src/modules/qt_uitools.pri
+++ b/src/modules/qt_uitools.pri
@@ -1,6 +1,6 @@
-QT.uitools.VERSION = 4.8.0
-QT.uitools.MAJOR_VERSION = 4
-QT.uitools.MINOR_VERSION = 8
+QT.uitools.VERSION = 5.0.0
+QT.uitools.MAJOR_VERSION = 5
+QT.uitools.MINOR_VERSION = 0
 QT.uitools.PATCH_VERSION = 0
 
 QT.uitools.name = QtUiTools
diff --git a/src/modules/qt_xml.pri b/src/modules/qt_xml.pri
index e7db6365eb..ea831236e6 100644
--- a/src/modules/qt_xml.pri
+++ b/src/modules/qt_xml.pri
@@ -1,6 +1,6 @@
-QT.xml.VERSION = 4.8.0
-QT.xml.MAJOR_VERSION = 4
-QT.xml.MINOR_VERSION = 8
+QT.xml.VERSION = 5.0.0
+QT.xml.MAJOR_VERSION = 5
+QT.xml.MINOR_VERSION = 0
 QT.xml.PATCH_VERSION = 0
 
 QT.xml.name = QtXml