summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp')
-rw-r--r--tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp53
1 files changed, 25 insertions, 28 deletions
diff --git a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
index 91ecbf23a2..288e41c6ef 100644
--- a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
+++ b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
@@ -605,8 +605,6 @@ public slots:
void tst_QApplication::quitOnLastWindowClosed()
{
-#ifndef Q_OS_MAC
- // Test hangs on Mac OS X, see QTBUG-24319
{
int argc = 0;
QApplication app(argc, 0, QApplication::GuiServer);
@@ -621,7 +619,6 @@ void tst_QApplication::quitOnLastWindowClosed()
// lastWindowClosed() signal should only be sent after the last dialog is closed
QCOMPARE(appSpy.count(), 2);
}
-#endif
{
int argc = 0;
QApplication app(argc, 0, QApplication::GuiServer);
@@ -1469,8 +1466,8 @@ void tst_QApplication::focusChanged()
QApplication::setActiveWindow(&parent1); // needs this on twm (focus follows mouse)
QCOMPARE(spy.count(), 1);
QCOMPARE(spy.at(0).count(), 2);
- old = qVariantValue<QWidget*>(spy.at(0).at(0));
- now = qVariantValue<QWidget*>(spy.at(0).at(1));
+ old = qvariant_cast<QWidget*>(spy.at(0).at(0));
+ now = qvariant_cast<QWidget*>(spy.at(0).at(1));
QVERIFY(now == &le1);
QVERIFY(now == QApplication::focusWidget());
QVERIFY(old == 0);
@@ -1479,8 +1476,8 @@ void tst_QApplication::focusChanged()
pb1.setFocus();
QCOMPARE(spy.count(), 1);
- old = qVariantValue<QWidget*>(spy.at(0).at(0));
- now = qVariantValue<QWidget*>(spy.at(0).at(1));
+ old = qvariant_cast<QWidget*>(spy.at(0).at(0));
+ now = qvariant_cast<QWidget*>(spy.at(0).at(1));
QVERIFY(now == &pb1);
QVERIFY(now == QApplication::focusWidget());
QVERIFY(old == &le1);
@@ -1488,8 +1485,8 @@ void tst_QApplication::focusChanged()
lb1.setFocus();
QCOMPARE(spy.count(), 1);
- old = qVariantValue<QWidget*>(spy.at(0).at(0));
- now = qVariantValue<QWidget*>(spy.at(0).at(1));
+ old = qvariant_cast<QWidget*>(spy.at(0).at(0));
+ now = qvariant_cast<QWidget*>(spy.at(0).at(1));
QVERIFY(now == &lb1);
QVERIFY(now == QApplication::focusWidget());
QVERIFY(old == &pb1);
@@ -1497,8 +1494,8 @@ void tst_QApplication::focusChanged()
lb1.clearFocus();
QCOMPARE(spy.count(), 1);
- old = qVariantValue<QWidget*>(spy.at(0).at(0));
- now = qVariantValue<QWidget*>(spy.at(0).at(1));
+ old = qvariant_cast<QWidget*>(spy.at(0).at(0));
+ now = qvariant_cast<QWidget*>(spy.at(0).at(1));
QVERIFY(now == 0);
QVERIFY(now == QApplication::focusWidget());
QVERIFY(old == &lb1);
@@ -1516,8 +1513,8 @@ void tst_QApplication::focusChanged()
parent2.show();
QApplication::setActiveWindow(&parent2); // needs this on twm (focus follows mouse)
QVERIFY(spy.count() > 0); // one for deactivation, one for activation on Windows
- old = qVariantValue<QWidget*>(spy.at(spy.count()-1).at(0));
- now = qVariantValue<QWidget*>(spy.at(spy.count()-1).at(1));
+ old = qvariant_cast<QWidget*>(spy.at(spy.count()-1).at(0));
+ now = qvariant_cast<QWidget*>(spy.at(spy.count()-1).at(1));
QVERIFY(now == &le2);
QVERIFY(now == QApplication::focusWidget());
QVERIFY(old == 0);
@@ -1550,8 +1547,8 @@ void tst_QApplication::focusChanged()
QVERIFY(now == QApplication::focusWidget());
} else {
QVERIFY(spy.count() > 0);
- old = qVariantValue<QWidget*>(spy.at(0).at(0));
- now = qVariantValue<QWidget*>(spy.at(0).at(1));
+ old = qvariant_cast<QWidget*>(spy.at(0).at(0));
+ now = qvariant_cast<QWidget*>(spy.at(0).at(1));
QVERIFY(now == &pb2);
QVERIFY(now == QApplication::focusWidget());
QVERIFY(old == &le2);
@@ -1564,8 +1561,8 @@ void tst_QApplication::focusChanged()
} else {
tab.simulate(now);
QVERIFY(spy.count() > 0);
- old = qVariantValue<QWidget*>(spy.at(0).at(0));
- now = qVariantValue<QWidget*>(spy.at(0).at(1));
+ old = qvariant_cast<QWidget*>(spy.at(0).at(0));
+ now = qvariant_cast<QWidget*>(spy.at(0).at(1));
QVERIFY(now == &le2);
QVERIFY(now == QApplication::focusWidget());
QVERIFY(old == &pb2);
@@ -1578,8 +1575,8 @@ void tst_QApplication::focusChanged()
} else {
backtab.simulate(now);
QVERIFY(spy.count() > 0);
- old = qVariantValue<QWidget*>(spy.at(0).at(0));
- now = qVariantValue<QWidget*>(spy.at(0).at(1));
+ old = qvariant_cast<QWidget*>(spy.at(0).at(0));
+ now = qvariant_cast<QWidget*>(spy.at(0).at(1));
QVERIFY(now == &pb2);
QVERIFY(now == QApplication::focusWidget());
QVERIFY(old == &le2);
@@ -1594,8 +1591,8 @@ void tst_QApplication::focusChanged()
} else {
backtab.simulate(now);
QVERIFY(spy.count() > 0);
- old = qVariantValue<QWidget*>(spy.at(0).at(0));
- now = qVariantValue<QWidget*>(spy.at(0).at(1));
+ old = qvariant_cast<QWidget*>(spy.at(0).at(0));
+ now = qvariant_cast<QWidget*>(spy.at(0).at(1));
QVERIFY(now == &le2);
QVERIFY(now == QApplication::focusWidget());
QVERIFY(old == &pb2);
@@ -1608,8 +1605,8 @@ void tst_QApplication::focusChanged()
QVERIFY(now == QApplication::focusWidget());
} else {
QVERIFY(spy.count() > 0);
- old = qVariantValue<QWidget*>(spy.at(0).at(0));
- now = qVariantValue<QWidget*>(spy.at(0).at(1));
+ old = qvariant_cast<QWidget*>(spy.at(0).at(0));
+ now = qvariant_cast<QWidget*>(spy.at(0).at(1));
QVERIFY(now == &pb2);
QVERIFY(now == QApplication::focusWidget());
QVERIFY(old == &le2);
@@ -1617,8 +1614,8 @@ void tst_QApplication::focusChanged()
click.simulate(old);
QVERIFY(spy.count() > 0);
- old = qVariantValue<QWidget*>(spy.at(0).at(0));
- now = qVariantValue<QWidget*>(spy.at(0).at(1));
+ old = qvariant_cast<QWidget*>(spy.at(0).at(0));
+ now = qvariant_cast<QWidget*>(spy.at(0).at(1));
QVERIFY(now == &le2);
QVERIFY(now == QApplication::focusWidget());
QVERIFY(old == &pb2);
@@ -1632,10 +1629,10 @@ void tst_QApplication::focusChanged()
//on windows, the change of focus is made in 2 steps
//(the focusChanged SIGNAL is emitted twice)
if (spy.count()==1)
- old = qVariantValue<QWidget*>(spy.at(spy.count()-1).at(0));
+ old = qvariant_cast<QWidget*>(spy.at(spy.count()-1).at(0));
else
- old = qVariantValue<QWidget*>(spy.at(spy.count()-2).at(0));
- now = qVariantValue<QWidget*>(spy.at(spy.count()-1).at(1));
+ old = qvariant_cast<QWidget*>(spy.at(spy.count()-2).at(0));
+ now = qvariant_cast<QWidget*>(spy.at(spy.count()-1).at(1));
QVERIFY(now == &le1);
QVERIFY(now == QApplication::focusWidget());
QVERIFY(old == &le2);
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 19:31:36 +0000