diff options
Diffstat (limited to 'tests/auto')
28 files changed, 77 insertions, 118 deletions
diff --git a/tests/auto/bic/data/QtConcurrent.5.0.0.linux-gcc-amd64.txt b/tests/auto/bic/data/QtConcurrent.5.0.0.linux-gcc-amd64.txt index 1e50448b10..945b757898 100644 --- a/tests/auto/bic/data/QtConcurrent.5.0.0.linux-gcc-amd64.txt +++ b/tests/auto/bic/data/QtConcurrent.5.0.0.linux-gcc-amd64.txt @@ -2412,11 +2412,6 @@ QObjectCleanupHandler (0x7f4f93c4fa90) 0 QObject (0x7f4f93e37f60) 0 primary-for QObjectCleanupHandler (0x7f4f93c4fa90) -Class QPointerBase - size=16 align=8 - base size=16 base align=8 -QPointerBase (0x7f4f93c62060) 0 - Class QSharedMemory::QPrivateSignal size=1 align=1 base size=0 base align=1 diff --git a/tests/auto/bic/data/QtConcurrent.5.0.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtConcurrent.5.0.0.linux-gcc-ia32.txt index b18f1c933c..dcf2570753 100644 --- a/tests/auto/bic/data/QtConcurrent.5.0.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtConcurrent.5.0.0.linux-gcc-ia32.txt @@ -2407,11 +2407,6 @@ QObjectCleanupHandler (0xb45852d0) 0 QObject (0xb4452038) 0 primary-for QObjectCleanupHandler (0xb45852d0) -Class QPointerBase - size=8 align=4 - base size=8 base align=4 -QPointerBase (0xb4452578) 0 - Class QSharedMemory::QPrivateSignal size=1 align=1 base size=0 base align=1 diff --git a/tests/auto/bic/data/QtCore.5.0.0.linux-gcc-amd64.txt b/tests/auto/bic/data/QtCore.5.0.0.linux-gcc-amd64.txt index 7308f3c082..bb689d46ea 100644 --- a/tests/auto/bic/data/QtCore.5.0.0.linux-gcc-amd64.txt +++ b/tests/auto/bic/data/QtCore.5.0.0.linux-gcc-amd64.txt @@ -2407,11 +2407,6 @@ QObjectCleanupHandler (0x7f392077aa90) 0 QObject (0x7f3920962f60) 0 primary-for QObjectCleanupHandler (0x7f392077aa90) -Class QPointerBase - size=16 align=8 - base size=16 base align=8 -QPointerBase (0x7f392078d060) 0 - Class QSharedMemory::QPrivateSignal size=1 align=1 base size=0 base align=1 diff --git a/tests/auto/bic/data/QtCore.5.0.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtCore.5.0.0.linux-gcc-ia32.txt index 469e52f1fb..00f8ca14c1 100644 --- a/tests/auto/bic/data/QtCore.5.0.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtCore.5.0.0.linux-gcc-ia32.txt @@ -2407,11 +2407,6 @@ QObjectCleanupHandler (0xb45942d0) 0 QObject (0xb4461038) 0 primary-for QObjectCleanupHandler (0xb45942d0) -Class QPointerBase - size=8 align=4 - base size=8 base align=4 -QPointerBase (0xb4461578) 0 - Class QSharedMemory::QPrivateSignal size=1 align=1 base size=0 base align=1 diff --git a/tests/auto/bic/data/QtDBus.5.0.0.linux-gcc-amd64.txt b/tests/auto/bic/data/QtDBus.5.0.0.linux-gcc-amd64.txt index 8bca40b218..275271594b 100644 --- a/tests/auto/bic/data/QtDBus.5.0.0.linux-gcc-amd64.txt +++ b/tests/auto/bic/data/QtDBus.5.0.0.linux-gcc-amd64.txt @@ -2407,11 +2407,6 @@ QObjectCleanupHandler (0x7fbaa1e96a90) 0 QObject (0x7fbaa1ea7000) 0 primary-for QObjectCleanupHandler (0x7fbaa1e96a90) -Class QPointerBase - size=16 align=8 - base size=16 base align=8 -QPointerBase (0x7fbaa1ea70c0) 0 - Class QSharedMemory::QPrivateSignal size=1 align=1 base size=0 base align=1 diff --git a/tests/auto/bic/data/QtDBus.5.0.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtDBus.5.0.0.linux-gcc-ia32.txt index 8e9b2acdc5..8c509033ad 100644 --- a/tests/auto/bic/data/QtDBus.5.0.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtDBus.5.0.0.linux-gcc-ia32.txt @@ -2407,11 +2407,6 @@ QObjectCleanupHandler (0xb452e2d0) 0 QObject (0xb43fc038) 0 primary-for QObjectCleanupHandler (0xb452e2d0) -Class QPointerBase - size=8 align=4 - base size=8 base align=4 -QPointerBase (0xb43fc578) 0 - Class QSharedMemory::QPrivateSignal size=1 align=1 base size=0 base align=1 diff --git a/tests/auto/bic/data/QtGui.5.0.0.linux-gcc-amd64.txt b/tests/auto/bic/data/QtGui.5.0.0.linux-gcc-amd64.txt index 1b57180796..875b25ffc5 100644 --- a/tests/auto/bic/data/QtGui.5.0.0.linux-gcc-amd64.txt +++ b/tests/auto/bic/data/QtGui.5.0.0.linux-gcc-amd64.txt @@ -2407,11 +2407,6 @@ QObjectCleanupHandler (0x7f7180f27a90) 0 QObject (0x7f7180e6d480) 0 primary-for QObjectCleanupHandler (0x7f7180f27a90) -Class QPointerBase - size=16 align=8 - base size=16 base align=8 -QPointerBase (0x7f7180e6d540) 0 - Class QSharedMemory::QPrivateSignal size=1 align=1 base size=0 base align=1 diff --git a/tests/auto/bic/data/QtGui.5.0.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtGui.5.0.0.linux-gcc-ia32.txt index 0b344d7411..cb310963bd 100644 --- a/tests/auto/bic/data/QtGui.5.0.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtGui.5.0.0.linux-gcc-ia32.txt @@ -2407,11 +2407,6 @@ QObjectCleanupHandler (0xb42044ec) 0 QObject (0xb41bb348) 0 primary-for QObjectCleanupHandler (0xb42044ec) -Class QPointerBase - size=8 align=4 - base size=8 base align=4 -QPointerBase (0xb41bb888) 0 - Class QSharedMemory::QPrivateSignal size=1 align=1 base size=0 base align=1 diff --git a/tests/auto/bic/data/QtNetwork.5.0.0.linux-gcc-amd64.txt b/tests/auto/bic/data/QtNetwork.5.0.0.linux-gcc-amd64.txt index 540ce9196b..4bfa81650a 100644 --- a/tests/auto/bic/data/QtNetwork.5.0.0.linux-gcc-amd64.txt +++ b/tests/auto/bic/data/QtNetwork.5.0.0.linux-gcc-amd64.txt @@ -2407,11 +2407,6 @@ QObjectCleanupHandler (0x7fb654a90a90) 0 QObject (0x7fb654c78f60) 0 primary-for QObjectCleanupHandler (0x7fb654a90a90) -Class QPointerBase - size=16 align=8 - base size=16 base align=8 -QPointerBase (0x7fb654aa3060) 0 - Class QSharedMemory::QPrivateSignal size=1 align=1 base size=0 base align=1 diff --git a/tests/auto/bic/data/QtNetwork.5.0.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtNetwork.5.0.0.linux-gcc-ia32.txt index db3eab60c1..313f83968c 100644 --- a/tests/auto/bic/data/QtNetwork.5.0.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtNetwork.5.0.0.linux-gcc-ia32.txt @@ -2407,11 +2407,6 @@ QObjectCleanupHandler (0xb434b2d0) 0 QObject (0xb4418070) 0 primary-for QObjectCleanupHandler (0xb434b2d0) -Class QPointerBase - size=8 align=4 - base size=8 base align=4 -QPointerBase (0xb44185b0) 0 - Class QSharedMemory::QPrivateSignal size=1 align=1 base size=0 base align=1 diff --git a/tests/auto/bic/data/QtOpenGL.5.0.0.linux-gcc-amd64.txt b/tests/auto/bic/data/QtOpenGL.5.0.0.linux-gcc-amd64.txt index 2d7d1aa224..0f51bab46e 100644 --- a/tests/auto/bic/data/QtOpenGL.5.0.0.linux-gcc-amd64.txt +++ b/tests/auto/bic/data/QtOpenGL.5.0.0.linux-gcc-amd64.txt @@ -2407,11 +2407,6 @@ QObjectCleanupHandler (0x7f04b9c1da90) 0 QObject (0x7f04b9b0e900) 0 primary-for QObjectCleanupHandler (0x7f04b9c1da90) -Class QPointerBase - size=16 align=8 - base size=16 base align=8 -QPointerBase (0x7f04b9b0e9c0) 0 - Class QSharedMemory::QPrivateSignal size=1 align=1 base size=0 base align=1 diff --git a/tests/auto/bic/data/QtOpenGL.5.0.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtOpenGL.5.0.0.linux-gcc-ia32.txt index 71154e9150..78509e24cc 100644 --- a/tests/auto/bic/data/QtOpenGL.5.0.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtOpenGL.5.0.0.linux-gcc-ia32.txt @@ -2407,11 +2407,6 @@ QObjectCleanupHandler (0xb4463c30) 0 QObject (0xb4070508) 0 primary-for QObjectCleanupHandler (0xb4463c30) -Class QPointerBase - size=8 align=4 - base size=8 base align=4 -QPointerBase (0xb4070a48) 0 - Class QSharedMemory::QPrivateSignal size=1 align=1 base size=0 base align=1 diff --git a/tests/auto/bic/data/QtPrintSupport.5.0.0.linux-gcc-amd64.txt b/tests/auto/bic/data/QtPrintSupport.5.0.0.linux-gcc-amd64.txt index 902bffaa02..bcdbbaf895 100644 --- a/tests/auto/bic/data/QtPrintSupport.5.0.0.linux-gcc-amd64.txt +++ b/tests/auto/bic/data/QtPrintSupport.5.0.0.linux-gcc-amd64.txt @@ -2412,11 +2412,6 @@ QObjectCleanupHandler (0x7f0bd6b6ba90) 0 QObject (0x7f0bd6aac4e0) 0 primary-for QObjectCleanupHandler (0x7f0bd6b6ba90) -Class QPointerBase - size=16 align=8 - base size=16 base align=8 -QPointerBase (0x7f0bd6aac5a0) 0 - Class QSharedMemory::QPrivateSignal size=1 align=1 base size=0 base align=1 diff --git a/tests/auto/bic/data/QtPrintSupport.5.0.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtPrintSupport.5.0.0.linux-gcc-ia32.txt index 4aba60c3b6..19cbef7918 100644 --- a/tests/auto/bic/data/QtPrintSupport.5.0.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtPrintSupport.5.0.0.linux-gcc-ia32.txt @@ -2407,11 +2407,6 @@ QObjectCleanupHandler (0xb426f5dc) 0 QObject (0xb4063508) 0 primary-for QObjectCleanupHandler (0xb426f5dc) -Class QPointerBase - size=8 align=4 - base size=8 base align=4 -QPointerBase (0xb4063a48) 0 - Class QSharedMemory::QPrivateSignal size=1 align=1 base size=0 base align=1 diff --git a/tests/auto/bic/data/QtSql.5.0.0.linux-gcc-amd64.txt b/tests/auto/bic/data/QtSql.5.0.0.linux-gcc-amd64.txt index 859f5621bc..6b1b8b3e72 100644 --- a/tests/auto/bic/data/QtSql.5.0.0.linux-gcc-amd64.txt +++ b/tests/auto/bic/data/QtSql.5.0.0.linux-gcc-amd64.txt @@ -2407,11 +2407,6 @@ QObjectCleanupHandler (0x7f5e7bb99a90) 0 QObject (0x7f5e7bd82f60) 0 primary-for QObjectCleanupHandler (0x7f5e7bb99a90) -Class QPointerBase - size=16 align=8 - base size=16 base align=8 -QPointerBase (0x7f5e7bbad060) 0 - Class QSharedMemory::QPrivateSignal size=1 align=1 base size=0 base align=1 diff --git a/tests/auto/bic/data/QtSql.5.0.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtSql.5.0.0.linux-gcc-ia32.txt index ca049cfb11..f3e4d84ee1 100644 --- a/tests/auto/bic/data/QtSql.5.0.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtSql.5.0.0.linux-gcc-ia32.txt @@ -2407,11 +2407,6 @@ QObjectCleanupHandler (0xb45532d0) 0 QObject (0xb4422038) 0 primary-for QObjectCleanupHandler (0xb45532d0) -Class QPointerBase - size=8 align=4 - base size=8 base align=4 -QPointerBase (0xb4422578) 0 - Class QSharedMemory::QPrivateSignal size=1 align=1 base size=0 base align=1 diff --git a/tests/auto/bic/data/QtTest.5.0.0.linux-gcc-amd64.txt b/tests/auto/bic/data/QtTest.5.0.0.linux-gcc-amd64.txt index 6c78fab45b..cda6ea5ec6 100644 --- a/tests/auto/bic/data/QtTest.5.0.0.linux-gcc-amd64.txt +++ b/tests/auto/bic/data/QtTest.5.0.0.linux-gcc-amd64.txt @@ -2407,11 +2407,6 @@ QObjectCleanupHandler (0x7fdcea1e6a90) 0 QObject (0x7fdcea1e2120) 0 primary-for QObjectCleanupHandler (0x7fdcea1e6a90) -Class QPointerBase - size=16 align=8 - base size=16 base align=8 -QPointerBase (0x7fdcea1e21e0) 0 - Class QSharedMemory::QPrivateSignal size=1 align=1 base size=0 base align=1 diff --git a/tests/auto/bic/data/QtTest.5.0.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtTest.5.0.0.linux-gcc-ia32.txt index aa7b491552..6583d33b0f 100644 --- a/tests/auto/bic/data/QtTest.5.0.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtTest.5.0.0.linux-gcc-ia32.txt @@ -2407,11 +2407,6 @@ QObjectCleanupHandler (0xb44aa348) 0 QObject (0xb441f0a8) 0 primary-for QObjectCleanupHandler (0xb44aa348) -Class QPointerBase - size=8 align=4 - base size=8 base align=4 -QPointerBase (0xb441f5e8) 0 - Class QSharedMemory::QPrivateSignal size=1 align=1 base size=0 base align=1 diff --git a/tests/auto/bic/data/QtWidgets.5.0.0.linux-gcc-amd64.txt b/tests/auto/bic/data/QtWidgets.5.0.0.linux-gcc-amd64.txt index 30e5f7a2d7..25e4d7d84e 100644 --- a/tests/auto/bic/data/QtWidgets.5.0.0.linux-gcc-amd64.txt +++ b/tests/auto/bic/data/QtWidgets.5.0.0.linux-gcc-amd64.txt @@ -2407,11 +2407,6 @@ QObjectCleanupHandler (0x7f8720705a90) 0 QObject (0x7f87206474e0) 0 primary-for QObjectCleanupHandler (0x7f8720705a90) -Class QPointerBase - size=16 align=8 - base size=16 base align=8 -QPointerBase (0x7f87206475a0) 0 - Class QSharedMemory::QPrivateSignal size=1 align=1 base size=0 base align=1 diff --git a/tests/auto/bic/data/QtWidgets.5.0.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtWidgets.5.0.0.linux-gcc-ia32.txt index 5768949810..64234d8c58 100644 --- a/tests/auto/bic/data/QtWidgets.5.0.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtWidgets.5.0.0.linux-gcc-ia32.txt @@ -2407,11 +2407,6 @@ QObjectCleanupHandler (0xb42315dc) 0 QObject (0xb4025508) 0 primary-for QObjectCleanupHandler (0xb42315dc) -Class QPointerBase - size=8 align=4 - base size=8 base align=4 -QPointerBase (0xb4025a48) 0 - Class QSharedMemory::QPrivateSignal size=1 align=1 base size=0 base align=1 diff --git a/tests/auto/bic/data/QtXml.5.0.0.linux-gcc-amd64.txt b/tests/auto/bic/data/QtXml.5.0.0.linux-gcc-amd64.txt index 10e33c0c0e..3658e535b9 100644 --- a/tests/auto/bic/data/QtXml.5.0.0.linux-gcc-amd64.txt +++ b/tests/auto/bic/data/QtXml.5.0.0.linux-gcc-amd64.txt @@ -2412,11 +2412,6 @@ QObjectCleanupHandler (0x7f6638185a90) 0 QObject (0x7f663836ef60) 0 primary-for QObjectCleanupHandler (0x7f6638185a90) -Class QPointerBase - size=16 align=8 - base size=16 base align=8 -QPointerBase (0x7f663819a060) 0 - Class QSharedMemory::QPrivateSignal size=1 align=1 base size=0 base align=1 diff --git a/tests/auto/bic/data/QtXml.5.0.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtXml.5.0.0.linux-gcc-ia32.txt index 62f4df364a..5d75609cf5 100644 --- a/tests/auto/bic/data/QtXml.5.0.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtXml.5.0.0.linux-gcc-ia32.txt @@ -2412,11 +2412,6 @@ QObjectCleanupHandler (0xb457e2d0) 0 QObject (0xb444d038) 0 primary-for QObjectCleanupHandler (0xb457e2d0) -Class QPointerBase - size=8 align=4 - base size=8 base align=4 -QPointerBase (0xb444d578) 0 - Class QSharedMemory::QPrivateSignal size=1 align=1 base size=0 base align=1 diff --git a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp index 4138795973..dd76fdd938 100644 --- a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp +++ b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp @@ -1657,6 +1657,10 @@ void tst_QLocale::ampm() QLocale id("id_ID"); QCOMPARE(id.amText(), QLatin1String("AM")); QCOMPARE(id.pmText(), QLatin1String("PM")); + + QLocale ta("ta_LK"); + QCOMPARE(ta.amText(), QLatin1String("AM")); + QCOMPARE(ta.pmText(), QLatin1String("PM")); } void tst_QLocale::dateFormat() diff --git a/tests/auto/gui/image/qimage/tst_qimage.cpp b/tests/auto/gui/image/qimage/tst_qimage.cpp index b668f57909..2cd5216c59 100644 --- a/tests/auto/gui/image/qimage/tst_qimage.cpp +++ b/tests/auto/gui/image/qimage/tst_qimage.cpp @@ -2115,5 +2115,5 @@ void tst_QImage::cleanupFunctions() } -QTEST_MAIN(tst_QImage) +QTEST_GUILESS_MAIN(tst_QImage) #include "tst_qimage.moc" diff --git a/tests/auto/network/ssl/ssl.pro b/tests/auto/network/ssl/ssl.pro index 294caeba5a..06f4a05241 100644 --- a/tests/auto/network/ssl/ssl.pro +++ b/tests/auto/network/ssl/ssl.pro @@ -4,11 +4,11 @@ SUBDIRS=\ qsslcipher \ qsslerror \ qsslkey \ - qsslsocket \ - qsslsocket_onDemandCertificates_member \ - qsslsocket_onDemandCertificates_static \ -!contains(QT_CONFIG, private_tests): SUBDIRS -= \ - qsslsocket \ - qsslsocket_onDemandCertificates_member \ - qsslsocket_onDemandCertificates_static \ +contains(QT_CONFIG, openssl) | contains(QT_CONFIG, openssl-linked): + contains(QT_CONFIG, private_tests) { + SUBDIRS += \ + qsslsocket \ + qsslsocket_onDemandCertificates_member \ + qsslsocket_onDemandCertificates_static \ + } diff --git a/tests/auto/sql/kernel/qsqlresult/testsqldriver.h b/tests/auto/sql/kernel/qsqlresult/testsqldriver.h index 93f4978ea6..9d435a0f7c 100644 --- a/tests/auto/sql/kernel/qsqlresult/testsqldriver.h +++ b/tests/auto/sql/kernel/qsqlresult/testsqldriver.h @@ -58,6 +58,11 @@ public: return QSqlResult::savePrepare(sqlquery); } + QVector<QVariant> boundValues() const + { + return QSqlResult::boundValues(); + } + protected: QVariant data(int /* index */) { return QVariant(); } bool isNull(int /* index */) { return false; } diff --git a/tests/auto/sql/kernel/qsqlresult/tst_qsqlresult.cpp b/tests/auto/sql/kernel/qsqlresult/tst_qsqlresult.cpp index 7e901d4b2c..ba6b4d1fbf 100644 --- a/tests/auto/sql/kernel/qsqlresult/tst_qsqlresult.cpp +++ b/tests/auto/sql/kernel/qsqlresult/tst_qsqlresult.cpp @@ -53,6 +53,7 @@ public: private slots: void positionalToNamedBinding(); + void parseOfBoundValues(); }; @@ -66,6 +67,39 @@ void tst_QSqlResult::positionalToNamedBinding() TestSqlDriverResult result(&testDriver); QString query("INSERT INTO MYTABLE (ID, NAME, BIRTH) VALUES(?, ?, ?)"); QVERIFY(result.savePrepare(query)); + QCOMPARE(result.boundValues().count(), 3); +} + +void tst_QSqlResult::parseOfBoundValues() +{ + TestSqlDriver testDriver; + TestSqlDriverResult result(&testDriver); + QVERIFY(result.savePrepare("SELECT :1 AS \":2\"")); + QCOMPARE(result.boundValues().count(), 1); + QVERIFY(result.savePrepare("SELECT :1 AS ':2'")); + QCOMPARE(result.boundValues().count(), 1); + QVERIFY(result.savePrepare("SELECT :1 AS [:2]")); + QCOMPARE(result.boundValues().count(), 1); + QVERIFY(result.savePrepare("SELECT :1 AS [:2]]]")); + QCOMPARE(result.boundValues().count(), 1); + QVERIFY(result.savePrepare("SELECT :1 AS [:2]]]]]")); + QCOMPARE(result.boundValues().count(), 1); + + QVERIFY(result.savePrepare("SELECT ? AS \"?\"")); + QCOMPARE(result.boundValues().count(), 1); + QVERIFY(result.savePrepare("SELECT ? AS '?'")); + QCOMPARE(result.boundValues().count(), 1); + QVERIFY(result.savePrepare("SELECT ? AS [?]")); + QCOMPARE(result.boundValues().count(), 1); + + QVERIFY(result.savePrepare("SELECT ? AS \"'?\"")); + QCOMPARE(result.boundValues().count(), 1); + QVERIFY(result.savePrepare("SELECT ? AS '?\"'")); + QCOMPARE(result.boundValues().count(), 1); + QVERIFY(result.savePrepare("SELECT ? AS '?''?'")); + QCOMPARE(result.boundValues().count(), 1); + QVERIFY(result.savePrepare("SELECT ? AS [\"?']")); + QCOMPARE(result.boundValues().count(), 1); } QTEST_MAIN( tst_QSqlResult ) diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp index ab1500ee32..c1927c9d1f 100644 --- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp +++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp @@ -411,6 +411,7 @@ private slots: void destroyedSignal(); void keyboardModifiers(); + void mouseDoubleClickBubbling_QTBUG29680(); private: bool ensureScreenSize(int width, int height); @@ -10047,5 +10048,30 @@ void tst_QWidget::keyboardModifiers() QCOMPARE(int(w->m_appModifiers), int(Qt::ControlModifier)); } +class DClickWidget : public QWidget +{ +public: + DClickWidget() : triggered(false) {} + void mouseDoubleClickEvent(QMouseEvent *) + { + triggered = true; + } + bool triggered; +}; + +void tst_QWidget::mouseDoubleClickBubbling_QTBUG29680() +{ + DClickWidget parent; + QWidget child(&parent); + parent.resize(200, 200); + child.resize(200, 200); + parent.show(); + QVERIFY(QTest::qWaitForWindowExposed(&parent)); + + QTest::mouseDClick(&child, Qt::LeftButton); + + QTRY_VERIFY(parent.triggered); +} + QTEST_MAIN(tst_QWidget) #include "tst_qwidget.moc" |