whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump Qt version to 5.1.0 

Change-Id: I6d372c933e48eeda921fe781b073bf4e05b31585
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Reviewed-by: David Faure (KDE) <faure@kde.org>
bb10
Frederik Gladhorn 2013-01-11 11:38:39 +01:00 committed by The Qt Project
parent f927efd77a
commit 7818eaf2b1
14 changed files with 54 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/concurrent/doc/qtconcurrent.qdocconf
View File

@ -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

10
src/corelib/doc/qtcore.qdocconf
View File

@ -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

4
src/corelib/global/qglobal.h
View File

@ -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))
*/

3
src/corelib/io/qdatastream.cpp
View File

@ -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()
*/

5
src/corelib/io/qdatastream.h
View File

@ -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
};

2
src/dbus/doc/qtdbus.qdocconf
View File

@ -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.

10
src/gui/doc/qtgui.qdocconf
View File

@ -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

10
src/network/doc/qtnetwork.qdocconf
View File

@ -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

2
src/opengl/doc/qtopengl.qdocconf
View File

@ -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.

10
src/printsupport/doc/qtprintsupport.qdocconf
View File

@ -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

10
src/sql/doc/qtsql.qdocconf
View File

@ -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

10
src/testlib/doc/qttestlib.qdocconf
View File

@ -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

10
src/widgets/doc/qtwidgets.qdocconf
View File

@ -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

10
src/xml/doc/qtxml.qdocconf
View File

@ -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