summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/concurrent/doc/qtconcurrent.qdocconf10
-rw-r--r--src/corelib/doc/qtcore.qdocconf10
-rw-r--r--src/corelib/global/qglobal.h4
-rw-r--r--src/corelib/io/qdatastream.cpp3
-rw-r--r--src/corelib/io/qdatastream.h5
-rw-r--r--src/dbus/doc/qtdbus.qdocconf2
-rw-r--r--src/gui/doc/qtgui.qdocconf10
-rw-r--r--src/network/doc/qtnetwork.qdocconf10
-rw-r--r--src/opengl/doc/qtopengl.qdocconf2
-rw-r--r--src/printsupport/doc/qtprintsupport.qdocconf10
-rw-r--r--src/sql/doc/qtsql.qdocconf10
-rw-r--r--src/testlib/doc/qttestlib.qdocconf10
-rw-r--r--src/widgets/doc/qtwidgets.qdocconf10
-rw-r--r--src/xml/doc/qtxml.qdocconf10
14 files changed, 54 insertions, 52 deletions
diff --git a/src/concurrent/doc/qtconcurrent.qdocconf b/src/concurrent/doc/qtconcurrent.qdocconf
index 442f69372c..2b2886703c 100644
--- a/src/concurrent/doc/qtconcurrent.qdocconf
+++ b/src/concurrent/doc/qtconcurrent.qdocconf
@@ -3,21 +3,21 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
project = QtConcurrent
description = Qt Concurrent Reference Documentation
url = http://qt-project.org/doc/qtconcurrent
-version = 5.0.1
+version = 5.1.0
examplesinstallpath = qtconcurrent
qhp.projects = QtConcurrent
qhp.QtConcurrent.file = qtconcurrent.qhp
-qhp.QtConcurrent.namespace = org.qt-project.qtconcurrent.501
+qhp.QtConcurrent.namespace = org.qt-project.qtconcurrent.510
qhp.QtConcurrent.virtualFolder = qtconcurrent
qhp.QtConcurrent.indexTitle = Qt Concurrent
qhp.QtConcurrent.indexRoot =
-qhp.QtConcurrent.filterAttributes = qtconcurrent 5.0.1 qtrefdoc
-qhp.QtConcurrent.customFilters.Qt.name = QtConcurrent 5.0.1
-qhp.QtConcurrent.customFilters.Qt.filterAttributes = qtconcurrent 5.0.1
+qhp.QtConcurrent.filterAttributes = qtconcurrent 5.1.0 qtrefdoc
+qhp.QtConcurrent.customFilters.Qt.name = QtConcurrent 5.1.0
+qhp.QtConcurrent.customFilters.Qt.filterAttributes = qtconcurrent 5.1.0
qhp.QtConcurrent.subprojects = classes
qhp.QtConcurrent.subprojects.classes.title = C++ Classes
diff --git a/src/corelib/doc/qtcore.qdocconf b/src/corelib/doc/qtcore.qdocconf
index 61c9d2bc00..afd46dfaff 100644
--- a/src/corelib/doc/qtcore.qdocconf
+++ b/src/corelib/doc/qtcore.qdocconf
@@ -3,21 +3,21 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
project = QtCore
description = Qt Core Reference Documentation
url = http://qt-project.org/doc/qtcore
-version = 5.0.1
+version = 5.1.0
examplesinstallpath = core
qhp.projects = QtCore
qhp.QtCore.file = qtcore.qhp
-qhp.QtCore.namespace = org.qt-project.qtcore.501
+qhp.QtCore.namespace = org.qt-project.qtcore.510
qhp.QtCore.virtualFolder = qtcore
qhp.QtCore.indexTitle = Qt Core
qhp.QtCore.indexRoot =
-qhp.QtCore.filterAttributes = qtcore 5.0.1 qtrefdoc
-qhp.QtCore.customFilters.Qt.name = QtCore 5.0.1
-qhp.QtCore.customFilters.Qt.filterAttributes = qtcore 5.0.1
+qhp.QtCore.filterAttributes = qtcore 5.1.0 qtrefdoc
+qhp.QtCore.customFilters.Qt.name = QtCore 5.1.0
+qhp.QtCore.customFilters.Qt.filterAttributes = qtcore 5.1.0
qhp.QtCore.subprojects = classes
qhp.QtCore.subprojects.classes.title = C++ Classes
qhp.QtCore.subprojects.classes.indexTitle = Qt Core C++ Classes
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 48cc477d51..03cd3dc591 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -45,11 +45,11 @@
#include <stddef.h>
-#define QT_VERSION_STR "5.0.1"
+#define QT_VERSION_STR "5.1.0"
/*
QT_VERSION is (major << 16) + (minor << 8) + patch.
*/
-#define QT_VERSION 0x050001
+#define QT_VERSION 0x050100
/*
can be used like #if (QT_VERSION >= QT_VERSION_CHECK(4, 4, 0))
*/
diff --git a/src/corelib/io/qdatastream.cpp b/src/corelib/io/qdatastream.cpp
index 5e5e155534..b0766e15b3 100644
--- a/src/corelib/io/qdatastream.cpp
+++ b/src/corelib/io/qdatastream.cpp
@@ -251,7 +251,7 @@ QT_BEGIN_NAMESPACE
return retVal;
enum {
- DefaultStreamVersion = QDataStream::Qt_5_0
+ DefaultStreamVersion = QDataStream::Qt_5_1
};
/*!
@@ -539,6 +539,7 @@ void QDataStream::setByteOrder(ByteOrder bo)
\value Qt_4_8 Same as Qt_4_6.
\value Qt_4_9 Same as Qt_4_6.
\value Qt_5_0 Version 13 (Qt 5.0)
+ \value Qt_5_1 Same as Qt_5_0.
\sa setVersion(), version()
*/
diff --git a/src/corelib/io/qdatastream.h b/src/corelib/io/qdatastream.h
index 89538a5fcf..3fc4808ec1 100644
--- a/src/corelib/io/qdatastream.h
+++ b/src/corelib/io/qdatastream.h
@@ -87,8 +87,9 @@ public:
Qt_4_7 = Qt_4_6,
Qt_4_8 = Qt_4_7,
Qt_4_9 = Qt_4_8,
- Qt_5_0 = 13
-#if QT_VERSION >= 0x050100
+ Qt_5_0 = 13,
+ Qt_5_1 = Qt_5_0
+#if QT_VERSION >= 0x050200
#error Add the datastream version for this Qt version
#endif
};
diff --git a/src/dbus/doc/qtdbus.qdocconf b/src/dbus/doc/qtdbus.qdocconf
index 7a58dada63..1ff4c0d6c7 100644
--- a/src/dbus/doc/qtdbus.qdocconf
+++ b/src/dbus/doc/qtdbus.qdocconf
@@ -36,7 +36,7 @@ qhp.qtdbus.file = qtdbus.qhp
# Namespace for the output file. This namespace is used to distinguish between
# different documentation files in Creator/Assistant.
-qhp.qtdbus.namespace = org.qt-project.qtdbus.501
+qhp.qtdbus.namespace = org.qt-project.qtdbus.510
# Title for the package, will be the main title for the package in
# Assistant/Creator.
diff --git a/src/gui/doc/qtgui.qdocconf b/src/gui/doc/qtgui.qdocconf
index a46aa9b3d1..469aa00472 100644
--- a/src/gui/doc/qtgui.qdocconf
+++ b/src/gui/doc/qtgui.qdocconf
@@ -3,21 +3,21 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
project = QtGui
description = Qt GUI Reference Documentation
url = http://qt-project.org/doc/qtgui
-version = 5.0.1
+version = 5.1.0
examplesinstallpath = gui
qhp.projects = QtGui
qhp.QtGui.file = qtgui.qhp
-qhp.QtGui.namespace = org.qt-project.qtgui.501
+qhp.QtGui.namespace = org.qt-project.qtgui.510
qhp.QtGui.virtualFolder = qtgui
qhp.QtGui.indexTitle = Qt GUI
qhp.QtGui.indexRoot =
-qhp.QtGui.filterAttributes = qtgui 5.0.1 qtrefdoc
-qhp.QtGui.customFilters.Qt.name = Qtgui 5.0.1
-qhp.QtGui.customFilters.Qt.filterAttributes = qtgui 5.0.1
+qhp.QtGui.filterAttributes = qtgui 5.1.0 qtrefdoc
+qhp.QtGui.customFilters.Qt.name = Qtgui 5.1.0
+qhp.QtGui.customFilters.Qt.filterAttributes = qtgui 5.1.0
qhp.QtGui.subprojects = classes
qhp.QtGui.subprojects.classes.title = C++ Classes
diff --git a/src/network/doc/qtnetwork.qdocconf b/src/network/doc/qtnetwork.qdocconf
index 702338e224..496dda967b 100644
--- a/src/network/doc/qtnetwork.qdocconf
+++ b/src/network/doc/qtnetwork.qdocconf
@@ -3,21 +3,21 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
project = QtNetwork
description = Qt Network Reference Documentation
url = http://qt-project.org/doc/qtnetwork
-version = 5.0.1
+version = 5.1.0
examplesinstallpath = network
qhp.projects = QtNetwork
qhp.QtNetwork.file = qtnetwork.qhp
-qhp.QtNetwork.namespace = org.qt-project.qtnetwork.501
+qhp.QtNetwork.namespace = org.qt-project.qtnetwork.510
qhp.QtNetwork.virtualFolder = qtnetwork
qhp.QtNetwork.indexTitle = Qt Network
qhp.QtNetwork.indexRoot =
-qhp.QtNetwork.filterAttributes = qtnetwork 5.0.1 qtrefdoc
-qhp.QtNetwork.customFilters.Qt.name = QtNetwork 5.0.1
-qhp.QtNetwork.customFilters.Qt.filterAttributes = qtnetwork 5.0.1
+qhp.QtNetwork.filterAttributes = qtnetwork 5.1.0 qtrefdoc
+qhp.QtNetwork.customFilters.Qt.name = QtNetwork 5.1.0
+qhp.QtNetwork.customFilters.Qt.filterAttributes = qtnetwork 5.1.0
qhp.QtNetwork.subprojects = classes
qhp.QtNetwork.subprojects.classes.title = C++ Classes
diff --git a/src/opengl/doc/qtopengl.qdocconf b/src/opengl/doc/qtopengl.qdocconf
index 131fdb8968..0ccc25ab49 100644
--- a/src/opengl/doc/qtopengl.qdocconf
+++ b/src/opengl/doc/qtopengl.qdocconf
@@ -39,7 +39,7 @@ qhp.qtopengl.file = qtopengl.qhp
# Namespace for the output file. This namespace is used to distinguish between
# different documentation files in Creator/Assistant.
-qhp.qtopengl.namespace = org.qt-project.qtopengl.501
+qhp.qtopengl.namespace = org.qt-project.qtopengl.510
# Title for the package, will be the main title for the package in
# Assistant/Creator.
diff --git a/src/printsupport/doc/qtprintsupport.qdocconf b/src/printsupport/doc/qtprintsupport.qdocconf
index 1a4d37ae49..25317d4773 100644
--- a/src/printsupport/doc/qtprintsupport.qdocconf
+++ b/src/printsupport/doc/qtprintsupport.qdocconf
@@ -3,21 +3,21 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
project = QtPrintSupport
description = Qt Print Support Reference Documentation
url = http://qt-project.org/doc/qtprintsupport
-version = 5.0.1
+version = 5.1.0
examplesinstallpath = printsupport
qhp.projects = QtPrintSupport
qhp.QtPrintSupport.file = qtprintsupport.qhp
-qhp.QtPrintSupport.namespace = org.qt-project.qtprintsupport.501
+qhp.QtPrintSupport.namespace = org.qt-project.qtprintsupport.510
qhp.QtPrintSupport.virtualFolder = qtprintsupport
qhp.QtPrintSupport.indexTitle = Qt Print Support
qhp.QtPrintSupport.indexRoot =
-qhp.QtPrintSupport.filterAttributes = qtprintsupport 5.0.1 qtrefdoc
-qhp.QtPrintSupport.customFilters.Qt.name = QtPrintSupport 5.0.1
-qhp.QtPrintSupport.customFilters.Qt.filterAttributes = qtprintsupport 5.0.1
+qhp.QtPrintSupport.filterAttributes = qtprintsupport 5.1.0 qtrefdoc
+qhp.QtPrintSupport.customFilters.Qt.name = QtPrintSupport 5.1.0
+qhp.QtPrintSupport.customFilters.Qt.filterAttributes = qtprintsupport 5.1.0
qhp.QtPrintSupport.subprojects = classes
qhp.QtPrintSupport.subprojects.classes.title = C++ Classes
diff --git a/src/sql/doc/qtsql.qdocconf b/src/sql/doc/qtsql.qdocconf
index 6c5af37de8..19dd9eae1e 100644
--- a/src/sql/doc/qtsql.qdocconf
+++ b/src/sql/doc/qtsql.qdocconf
@@ -3,21 +3,21 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
project = QtSql
description = Qt SQL Reference Documentation
url = http://qt-project.org/doc/qtsql
-version = 5.0.1
+version = 5.1.0
examplesinstallpath = sql
qhp.projects = QtSql
qhp.QtSql.file = qtsql.qhp
-qhp.QtSql.namespace = org.qt-project.qtsql.501
+qhp.QtSql.namespace = org.qt-project.qtsql.510
qhp.QtSql.virtualFolder = qtsql
qhp.QtSql.indexTitle = Qt SQL
qhp.QtSql.indexRoot =
-qhp.QtSql.filterAttributes = qtsql 5.0.1 qtrefdoc
-qhp.QtSql.customFilters.Qt.name = QtSql 5.0.1
-qhp.QtSql.customFilters.Qt.filterAttributes = qtsql 5.0.1
+qhp.QtSql.filterAttributes = qtsql 5.1.0 qtrefdoc
+qhp.QtSql.customFilters.Qt.name = QtSql 5.1.0
+qhp.QtSql.customFilters.Qt.filterAttributes = qtsql 5.1.0
qhp.QtSql.subprojects = classes
qhp.QtSql.subprojects.classes.title = C++ Classes
diff --git a/src/testlib/doc/qttestlib.qdocconf b/src/testlib/doc/qttestlib.qdocconf
index 2a2a1e4ea0..1f0c35c389 100644
--- a/src/testlib/doc/qttestlib.qdocconf
+++ b/src/testlib/doc/qttestlib.qdocconf
@@ -3,21 +3,21 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
project = QtTestLib
description = Qt Test Reference Documentation
url = http://qt-project.org/doc/qttestlib
-version = 5.0.1
+version = 5.1.0
examplesinstallpath = testlib
qhp.projects = QtTestLib
qhp.QtTestLib.file = qttestlib.qhp
-qhp.QtTestLib.namespace = org.qt-project.qttest.501
+qhp.QtTestLib.namespace = org.qt-project.qttest.510
qhp.QtTestLib.virtualFolder = qttest
qhp.QtTestLib.indexTitle = Qt Test
qhp.QtTestLib.indexRoot =
-qhp.QtTestLib.filterAttributes = qttestlib 5.0.1 qtrefdoc
-qhp.QtTestLib.customFilters.Qt.name = QtTestLib 5.0.1
-qhp.QtTestLib.customFilters.Qt.filterAttributes = qttest 5.0.1
+qhp.QtTestLib.filterAttributes = qttestlib 5.1.0 qtrefdoc
+qhp.QtTestLib.customFilters.Qt.name = QtTestLib 5.1.0
+qhp.QtTestLib.customFilters.Qt.filterAttributes = qttest 5.1.0
qhp.QtTestLib.subprojects = classes
qhp.QtTestLib.subprojects.classes.title = C++ Classes
diff --git a/src/widgets/doc/qtwidgets.qdocconf b/src/widgets/doc/qtwidgets.qdocconf
index 062adc7f7c..2cd6887f83 100644
--- a/src/widgets/doc/qtwidgets.qdocconf
+++ b/src/widgets/doc/qtwidgets.qdocconf
@@ -3,21 +3,21 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
project = QtWidgets
description = Qt Widgets Reference Documentation
url = http://qt-project.org/doc/qtwidgets
-version = 5.0.1
+version = 5.1.0
examplesinstallpath = widgets
qhp.projects = QtWidgets
qhp.QtWidgets.file = qtwidgets.qhp
-qhp.QtWidgets.namespace = org.qt-project.qtwidgets.501
+qhp.QtWidgets.namespace = org.qt-project.qtwidgets.510
qhp.QtWidgets.virtualFolder = qtwidgets
qhp.QtWidgets.indexTitle = Qt Widgets
qhp.QtWidgets.indexRoot =
-qhp.QtWidgets.filterAttributes = qtwidgets 5.0.1 qtrefdoc
-qhp.QtWidgets.customFilters.Qt.name = QtWidgets 5.0.1
-qhp.QtWidgets.customFilters.Qt.filterAttributes = qtwidgets 5.0.1
+qhp.QtWidgets.filterAttributes = qtwidgets 5.1.0 qtrefdoc
+qhp.QtWidgets.customFilters.Qt.name = QtWidgets 5.1.0
+qhp.QtWidgets.customFilters.Qt.filterAttributes = qtwidgets 5.1.0
qhp.QtWidgets.subprojects = classes
qhp.QtWidgets.subprojects.classes.title = C++ Classes
diff --git a/src/xml/doc/qtxml.qdocconf b/src/xml/doc/qtxml.qdocconf
index bf77059a02..028af1bf76 100644
--- a/src/xml/doc/qtxml.qdocconf
+++ b/src/xml/doc/qtxml.qdocconf
@@ -3,21 +3,21 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
project = QtXml
description = Qt XML Reference Documentation
url = http://qt-project.org/doc/qtxml
-version = 5.0.1
+version = 5.1.0
examplesinstallpath = xml
qhp.projects = QtXml
qhp.QtXml.file = qtxml.qhp
-qhp.QtXml.namespace = org.qt-project.qtxml.501
+qhp.QtXml.namespace = org.qt-project.qtxml.510
qhp.QtXml.virtualFolder = qtxml
qhp.QtXml.indexTitle = Qt XML
qhp.QtXml.indexRoot =
-qhp.QtXml.filterAttributes = qtxml 5.0.1 qtrefdoc
-qhp.QtXml.customFilters.Qt.name = QtXml 5.0.1
-qhp.QtXml.customFilters.Qt.filterAttributes = qtxml 5.0.1
+qhp.QtXml.filterAttributes = qtxml 5.1.0 qtrefdoc
+qhp.QtXml.customFilters.Qt.name = QtXml 5.1.0
+qhp.QtXml.customFilters.Qt.filterAttributes = qtxml 5.1.0
qhp.QtXml.subprojects = classes
qhp.QtXml.subprojects.classes.title = C++ Classes