diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-24 17:19:40 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-24 21:02:08 +0100 |
| commit | 34b14a8472f44f8517577756e033b92ebd4c5912 (patch) | |
| tree | 66a0575156d0a17a835430137e218e2b3f04cc65 /tests/auto/corelib/tools | |
| parent | d34353a065c443aac20376cbd88323480d769183 (diff) | |
| parent | edd555425a08f9e074f0a4d9333862636ccaae8d (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
examples/xml/htmlinfo/simpleexample.html
examples/xml/rsslisting/rsslisting.cpp
qmake/generators/win32/msbuild_objectmodel.cpp
src/3rdparty/harfbuzz-ng/src/hb-private.hh
src/corelib/global/qlogging.cpp
src/corelib/io/qstorageinfo_unix.cpp
src/corelib/thread/qwaitcondition_unix.cpp
src/gui/kernel/qguiapplication.cpp
src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp
src/testlib/doc/src/qt-webpages.qdoc
tests/auto/other/qaccessibility/tst_qaccessibility.cpp
Change-Id: Ib272ff0bc30a1a5d51275eb3cd2f201dc82c11ff
Diffstat (limited to 'tests/auto/corelib/tools')
| -rw-r--r-- | tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp | 12 | ||||
| -rw-r--r-- | tests/auto/corelib/tools/qvector/tst_qvector.cpp | 7 |
2 files changed, 19 insertions, 0 deletions
diff --git a/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp b/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp index d1f05cd5e8..c6806086d3 100644 --- a/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp +++ b/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp @@ -2806,10 +2806,12 @@ void tst_QDateTime::timeZones() const QCOMPARE(invalidDateTime.time(), QTime(0, 0, 0)); QTimeZone nzTz = QTimeZone("Pacific/Auckland"); + QTimeZone nzTzOffset = QTimeZone(12 * 3600); // During Standard Time NZ is +12:00 QDateTime utcStd(QDate(2012, 6, 1), QTime(0, 0, 0), Qt::UTC); QDateTime nzStd(QDate(2012, 6, 1), QTime(12, 0, 0), nzTz); + QDateTime nzStdOffset(QDate(2012, 6, 1), QTime(12, 0, 0), nzTzOffset); QCOMPARE(nzStd.isValid(), true); QCOMPARE(nzStd.timeSpec(), Qt::TimeZone); @@ -2821,6 +2823,16 @@ void tst_QDateTime::timeZones() const QCOMPARE(nzStd.isDaylightTime(), false); QCOMPARE(nzStd.toMSecsSinceEpoch(), utcStd.toMSecsSinceEpoch()); + QCOMPARE(nzStdOffset.isValid(), true); + QCOMPARE(nzStdOffset.timeSpec(), Qt::TimeZone); + QCOMPARE(nzStdOffset.date(), QDate(2012, 6, 1)); + QCOMPARE(nzStdOffset.time(), QTime(12, 0, 0)); + QVERIFY(nzStdOffset.timeZone() == nzTzOffset); + QCOMPARE(nzStdOffset.timeZone().id(), QByteArray("UTC+12:00")); + QCOMPARE(nzStdOffset.offsetFromUtc(), 43200); + QCOMPARE(nzStdOffset.isDaylightTime(), false); + QCOMPARE(nzStdOffset.toMSecsSinceEpoch(), utcStd.toMSecsSinceEpoch()); + // During Daylight Time NZ is +13:00 QDateTime utcDst(QDate(2012, 1, 1), QTime(0, 0, 0), Qt::UTC); QDateTime nzDst(QDate(2012, 1, 1), QTime(13, 0, 0), nzTz); diff --git a/tests/auto/corelib/tools/qvector/tst_qvector.cpp b/tests/auto/corelib/tools/qvector/tst_qvector.cpp index 6afc676576..69da6e450e 100644 --- a/tests/auto/corelib/tools/qvector/tst_qvector.cpp +++ b/tests/auto/corelib/tools/qvector/tst_qvector.cpp @@ -1512,11 +1512,18 @@ void tst_QVector::remove() const QVERIFY(myvec.removeOne(val2)); QCOMPARE(myvec, QVector<T>() << val1 << val3 << val1 << val3 << val1 << val2 << val3); + QVector<T> myvecCopy = myvec; + QVERIFY(myvecCopy.isSharedWith(myvec)); // removeAll() QCOMPARE(myvec.removeAll(val4), 0); + QVERIFY(myvecCopy.isSharedWith(myvec)); QCOMPARE(myvec.removeAll(val1), 3); + QVERIFY(!myvecCopy.isSharedWith(myvec)); QCOMPARE(myvec, QVector<T>() << val3 << val3 << val2 << val3); + myvecCopy = myvec; + QVERIFY(myvecCopy.isSharedWith(myvec)); QCOMPARE(myvec.removeAll(val2), 1); + QVERIFY(!myvecCopy.isSharedWith(myvec)); QCOMPARE(myvec, QVector<T>() << val3 << val3 << val3); // remove rest |