AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

Browse Source 
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Temporarily changed autotest behaviour to ignore Qt version
  Updated version references in autotests
  Updated default Qt version to 5.0.0
  Removed deprecated functions in QList
  Updated Qt and QtBase module version number to 5.0.0
  Updated data stream version for Qt 4.9 and 5.0
This commit is contained in:
Qt Continuous Integration System 2011-05-14 00:34:32 +10:00
commit c0b9ed2e09
26 changed files with 54 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,11 +44,11 @@
#include <stddef.h>
#define QT_VERSION_STR "4.8.0"
#define QT_VERSION_STR "5.0.0"
/*
QT_VERSION is (major << 16) + (minor << 8) + patch.
*/
#define QT_VERSION 0x040800
#define QT_VERSION 0x050000
/*
can be used like #if (QT_VERSION >= QT_VERSION_CHECK(4, 4, 0))
*/

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

@ -86,10 +86,11 @@ public:
Qt_4_5 = 11,
Qt_4_6 = 12,
Qt_4_7 = Qt_4_6,
Qt_4_8 = Qt_4_7
#if QT_VERSION >= 0x040900
Qt_4_8 = Qt_4_7,
Qt_4_9 = Qt_4_8,
Qt_5_0 = Qt_4_8
#if QT_VERSION >= 0x050100
#error Add the datastream version for this Qt version
Qt_4_9 = Qt_4_8
#endif
};

91
src/corelib/tools/qlist.cpp
View File

@ -113,64 +113,6 @@ QListData::Data *QListData::detach_grow(int *idx, int num)
return x;
}
#if QT_VERSION >= 0x050000
# error "Remove QListData::detach(), it is only required for binary compatibility for 4.0.x to 4.2.x"
#endif
QListData::Data *QListData::detach()
{
Data *x = static_cast<Data *>(qMalloc(DataHeaderSize + d->alloc * sizeof(void *)));
Q_CHECK_PTR(x);
x->ref = 1;
x->sharable = true;
x->alloc = d->alloc;
if (!x->alloc) {
x->begin = 0;
x->end = 0;
} else {
x->begin = d->begin;
x->end = d->end;
}
qSwap(d, x);
if (!x->ref.deref())
return x;
return 0;
}
/*!
* Detaches the QListData by reallocating new memory.
* Returns the old (shared) data, it is up to the caller to deref() and free()
* For the new data node_copy needs to be called.
*
* \internal
*/
#if QT_VERSION >= 0x050000
# error "Remove QListData::detach2(), it is only required for binary compatibility for 4.3.x to 4.5.x"
#endif
QListData::Data *QListData::detach2()
{
Data *x = d;
Data* t = static_cast<Data *>(qMalloc(DataHeaderSize + x->alloc * sizeof(void *)));
Q_CHECK_PTR(t);
::memcpy(t, d, DataHeaderSize + d->alloc * sizeof(void *));
t->ref = 1;
t->sharable = true;
t->alloc = x->alloc;
if (!t->alloc) {
t->begin = 0;
t->end = 0;
} else {
t->begin = x->begin;
t->end = x->end;
}
d = t;
return x;
}
/*!
* Detaches the QListData by allocating new memory for a list which possibly
* has a different size than the copied one.
@ -200,21 +142,6 @@ QListData::Data *QListData::detach(int alloc)
return x;
}
/*!
* Detaches the QListData by reallocating new memory.
* Returns the old (shared) data, it is up to the caller to deref() and free()
* For the new data node_copy needs to be called.
*
* \internal
*/
#if QT_VERSION >= 0x050000
# error "Remove QListData::detach3(), it is only required for binary compatibility for 4.5.x to 4.6.x"
#endif
QListData::Data *QListData::detach3()
{
return detach(d->alloc);
}
void QListData::realloc(int alloc)
{
Q_ASSERT(d->ref == 1);
@ -253,24 +180,6 @@ void **QListData::append()
return append(1);
}
// ensures that enough space is available to append the list
#if QT_VERSION >= 0x050000
# error "Remove QListData::append(), it is only required for binary compatibility up to 4.5.x"
#endif
void **QListData::append(const QListData& l)
{
Q_ASSERT(d->ref == 1);
int e = d->end;
int n = l.d->end - l.d->begin;
if (n) {
if (e + n > d->alloc)
realloc(grow(e + n));
::memcpy(d->array + d->end, l.d->array + l.d->begin, n*sizeof(void*));
d->end += n;
}
return d->array + e;
}
// ensures that enough space is available to append the list
void **QListData::append2(const QListData& l)
{

6
src/modules/qt_core.pri
View File

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

6
src/modules/qt_dbus.pri
View File

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

6
src/modules/qt_gui.pri
View File

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

6
src/modules/qt_network.pri
View File

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

6
src/modules/qt_opengl.pri
View File

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

6
src/modules/qt_openvg.pri
View File

@ -1,6 +1,6 @@
QT.openvg.VERSION = 4.8.0
QT.openvg.MAJOR_VERSION = 4
QT.openvg.MINOR_VERSION = 8
QT.openvg.VERSION = 5.0.0
QT.openvg.MAJOR_VERSION = 5
QT.openvg.MINOR_VERSION = 0
QT.openvg.PATCH_VERSION = 0
QT.openvg.name = QtOpenVG

6
src/modules/qt_sql.pri
View File

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

6
src/modules/qt_testlib.pri
View File

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

6
src/modules/qt_uilib.pri
View File

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

6
src/modules/qt_uitools.pri
View File

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

6
src/modules/qt_xml.pri
View File

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

2
src/plugins/qpluginbase.pri
View File

@ -1,6 +1,6 @@
TEMPLATE = lib
isEmpty(QT_MAJOR_VERSION) {
VERSION=4.8.0
VERSION=5.0.0
} else {
VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
}

2
src/qbase.pri
View File

@ -12,7 +12,7 @@ INCLUDEPATH *= $$MODULE_INCLUDES $$MODULE_INCLUDES/.. #just for today to have so
isEmpty(QT_ARCH):!isEmpty(ARCH):QT_ARCH=$$ARCH #another compat that will rot for change #215700
TEMPLATE = lib
isEmpty(QT_MAJOR_VERSION) {
VERSION=4.8.0
VERSION=5.0.0
} else {
VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
}

2
tests/arthur/baselineserver/src/baselineserver.cpp
View File

@ -512,7 +512,7 @@ void BaselineHandler::testPathMapping()
item.imageChecksums << 0x0123456789abcdefULL;
item.itemChecksum = 0x0123;
plat.insert(PI_QtVersion, QLS("4.8.0"));
plat.insert(PI_QtVersion, QLS("5.0.0"));
plat.insert(PI_BuildKey, QLS("(nobuildkey)"));
plat.insert(PI_QMakeSpec, QLS("linux-g++"));
plat.insert(PI_PulseGitBranch, QLS("somebranch"));

8
tests/auto/qset/tst_qset.cpp
View File

@ -715,12 +715,12 @@ void tst_QSet::stlMutableIterator()
QVERIFY(set2.isEmpty());
QVERIFY(set3.isEmpty());
#if QT_VERSION >= 0x050000
i = set2.insert("foo");
#else
// #if QT_VERSION >= 0x050000
// i = set2.insert("foo");
// #else
QSet<QString>::const_iterator k = set2.insert("foo");
i = reinterpret_cast<QSet<QString>::iterator &>(k);
#endif
// #endif
QVERIFY(*i == "foo");
}
}

2
tests/auto/selftests/expected_cmptest.txt
View File

@ -1,5 +1,5 @@
********* Start testing of tst_Cmptest *********
Config: Using QTest library 4.8.0, Qt 4.8.0
Config: Using QTest library 5.0.0, Qt 5.0.0
PASS : tst_Cmptest::initTestCase()
PASS : tst_Cmptest::compare_boolfuncs()
PASS : tst_Cmptest::compare_pointerfuncs()

2
tests/auto/selftests/expected_crashes_3.txt
View File

@ -1,5 +1,5 @@
********* Start testing of tst_Crashes *********
Config: Using QTest library 4.8.0, Qt 4.8.0
Config: Using QTest library 5.0.0, Qt 5.0.0
PASS : tst_Crashes::initTestCase()
QFATAL : tst_Crashes::crash() Received signal 11
FAIL! : tst_Crashes::crash() Received a fatal error.

2
tests/auto/selftests/expected_longstring.txt
View File

@ -1,5 +1,5 @@
********* Start testing of tst_LongString *********
Config: Using QTest library 4.8.0, Qt 4.8.0
Config: Using QTest library 5.0.0, Qt 5.0.0
PASS : tst_LongString::initTestCase()
FAIL! : tst_LongString::failWithLongString() Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi. Aenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim. Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet. Etiam ultricies nisi vel augue. Curabitur ullamcorper ultricies nisi. Nam eget dui.

2
tests/auto/selftests/expected_maxwarnings.txt
View File

@ -1,5 +1,5 @@
********* Start testing of MaxWarnings *********
Config: Using QTest library 4.8.0, Qt 4.8.0
Config: Using QTest library 5.0.0, Qt 5.0.0
PASS : MaxWarnings::initTestCase()
QWARN : MaxWarnings::warn() 0
QWARN : MaxWarnings::warn() 1

2
tests/auto/selftests/expected_skip.txt
View File

@ -1,5 +1,5 @@
********* Start testing of tst_Skip *********
Config: Using QTest library 4.8.0, Qt 4.8.0
Config: Using QTest library 5.0.0, Qt 5.0.0
PASS : tst_Skip::initTestCase()
SKIP : tst_Skip::test() skipping all
Loc: [/home/user/depot/qt-git/mainline/tests/auto/selftests/skip/tst_skip.cpp(68)]

2
tests/auto/uic/baseline/gridalignment.ui.h
View File

@ -2,7 +2,7 @@
** Form generated from reading UI file 'gridalignment.ui'
**
** Created: Fri Oct 22 14:33:59 2010
** by: Qt User Interface Compiler version 4.8.0
** by: Qt User Interface Compiler version 5.0.0
**
** WARNING! All changes made in this file will be lost when recompiling UI file!
********************************************************************************/

2
tests/auto/uic/baseline/icontheme.ui.h
View File

@ -2,7 +2,7 @@
** Form generated from reading UI file 'icontheme.ui'
**
** Created: Thu Sep 2 10:28:19 2010
** by: Qt User Interface Compiler version 4.8.0
** by: Qt User Interface Compiler version 5.0.0
**
** WARNING! All changes made in this file will be lost when recompiling UI file!
********************************************************************************/

2
tests/benchmarks/corelib/tools/qhash/qhash_string.cpp
View File

@ -51,7 +51,7 @@ string is a good idea.
////////////////////////////////////////////////////////////////////
********* Start testing of tst_QHash *********
Config: Using QTest library 4.8.0, Qt 4.8.0
Config: Using QTest library 5.0.0, Qt 5.0.0
PASS : tst_QHash::initTestCase()
RESULT : tst_QHash::qhash_qt4():
0.041 msecs per iteration (total: 85, iterations: 2048)