diff options
Diffstat (limited to 'tests/auto/widgets')
50 files changed, 489 insertions, 591 deletions
diff --git a/tests/auto/widgets/dialogs/dialogs.pro b/tests/auto/widgets/dialogs/dialogs.pro index e74323a305..53e2338158 100644 --- a/tests/auto/widgets/dialogs/dialogs.pro +++ b/tests/auto/widgets/dialogs/dialogs.pro @@ -16,3 +16,5 @@ SUBDIRS=\ !contains(QT_CONFIG, private_tests): SUBDIRS -= \ qsidebar \ + +mac:qinputdialog.CONFIG += no_check_target # QTBUG-25496 diff --git a/tests/auto/widgets/dialogs/qdialog/qdialog.pro b/tests/auto/widgets/dialogs/qdialog/qdialog.pro index 779c10ed66..2c4d10dd0b 100644 --- a/tests/auto/widgets/dialogs/qdialog/qdialog.pro +++ b/tests/auto/widgets/dialogs/qdialog/qdialog.pro @@ -2,4 +2,3 @@ CONFIG += testcase TARGET = tst_qdialog QT += widgets testlib SOURCES += tst_qdialog.cpp -mac:CONFIG += insignificant_test # QTBUG-24977 diff --git a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp index 14c2be5bd8..a62c1a8f9a 100644 --- a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp +++ b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp @@ -504,7 +504,7 @@ void tst_QFiledialog::completer() // press 'keys' for the input for (int i = 0; i < input.count(); ++i) - QTest::keyPress(lineEdit, input[i].toAscii()); + QTest::keyPress(lineEdit, input[i].toLatin1()); QStringList expectedFiles; if (expected == -1) { @@ -1061,11 +1061,11 @@ void tst_QFiledialog::historyBack() QCOMPARE(backButton->isEnabled(), true); QCOMPARE(forwardButton->isEnabled(), true); QCOMPARE(spy.count(), 3); - QString currentPath = qVariantValue<QString>(spy.last().first()); + QString currentPath = qvariant_cast<QString>(spy.last().first()); QCOMPARE(model->index(currentPath), model->index(temp)); backButton->click(); - currentPath = qVariantValue<QString>(spy.last().first()); + currentPath = qvariant_cast<QString>(spy.last().first()); QCOMPARE(currentPath, home); QCOMPARE(backButton->isEnabled(), false); QCOMPARE(forwardButton->isEnabled(), true); @@ -1101,39 +1101,39 @@ void tst_QFiledialog::historyForward() backButton->click(); QCOMPARE(forwardButton->isEnabled(), true); - QCOMPARE(model->index(qVariantValue<QString>(spy.last().first())), model->index(temp)); + QCOMPARE(model->index(qvariant_cast<QString>(spy.last().first())), model->index(temp)); forwardButton->click(); - QCOMPARE(model->index(qVariantValue<QString>(spy.last().first())), model->index(desktop)); + QCOMPARE(model->index(qvariant_cast<QString>(spy.last().first())), model->index(desktop)); QCOMPARE(backButton->isEnabled(), true); QCOMPARE(forwardButton->isEnabled(), false); QCOMPARE(spy.count(), 4); backButton->click(); - QCOMPARE(model->index(qVariantValue<QString>(spy.last().first())), model->index(temp)); + QCOMPARE(model->index(qvariant_cast<QString>(spy.last().first())), model->index(temp)); QCOMPARE(backButton->isEnabled(), true); backButton->click(); - QCOMPARE(model->index(qVariantValue<QString>(spy.last().first())), model->index(home)); + QCOMPARE(model->index(qvariant_cast<QString>(spy.last().first())), model->index(home)); QCOMPARE(backButton->isEnabled(), false); QCOMPARE(forwardButton->isEnabled(), true); QCOMPARE(spy.count(), 6); forwardButton->click(); - QCOMPARE(model->index(qVariantValue<QString>(spy.last().first())), model->index(temp)); + QCOMPARE(model->index(qvariant_cast<QString>(spy.last().first())), model->index(temp)); backButton->click(); - QCOMPARE(model->index(qVariantValue<QString>(spy.last().first())), model->index(home)); + QCOMPARE(model->index(qvariant_cast<QString>(spy.last().first())), model->index(home)); QCOMPARE(spy.count(), 8); forwardButton->click(); - QCOMPARE(model->index(qVariantValue<QString>(spy.last().first())), model->index(temp)); + QCOMPARE(model->index(qvariant_cast<QString>(spy.last().first())), model->index(temp)); forwardButton->click(); - QCOMPARE(model->index(qVariantValue<QString>(spy.last().first())), model->index(desktop)); + QCOMPARE(model->index(qvariant_cast<QString>(spy.last().first())), model->index(desktop)); backButton->click(); - QCOMPARE(model->index(qVariantValue<QString>(spy.last().first())), model->index(temp)); + QCOMPARE(model->index(qvariant_cast<QString>(spy.last().first())), model->index(temp)); backButton->click(); - QCOMPARE(model->index(qVariantValue<QString>(spy.last().first())), model->index(home)); + QCOMPARE(model->index(qvariant_cast<QString>(spy.last().first())), model->index(home)); fd.setDirectory(desktop); QCOMPARE(forwardButton->isEnabled(), false); } diff --git a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp index 4a6f714a7c..d90c6f8851 100644 --- a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp +++ b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp @@ -568,7 +568,7 @@ void tst_QFileDialog2::completionOnLevelAfterRoot() // - No another dir with same start QString testDir; foreach (const QString &entry, entryList) { - if (entry.size() > 5 && QString(entry.toAscii()).compare(entry) == 0) { + if (entry.size() > 5 && QString(entry.toLatin1()).compare(entry) == 0) { bool invalid = false; for (int i = 0; i < 5; i++) { if (!entry.at(i).isLetter()) { @@ -605,7 +605,7 @@ void tst_QFileDialog2::completionOnLevelAfterRoot() #if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) //I love testlib :D for (int i = 0; i < 5; i++) - QTest::keyClick(edit, testDir.at(i).toLower().toAscii() - 'a' + Qt::Key_A); + QTest::keyClick(edit, testDir.at(i).toLower().toLatin1() - 'a' + Qt::Key_A); #else QTest::keyClick(edit, Qt::Key_E); QTest::keyClick(edit, Qt::Key_T); diff --git a/tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog.cpp b/tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog.cpp index 6b2caf17d7..533014b1c9 100644 --- a/tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog.cpp +++ b/tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog.cpp @@ -160,12 +160,9 @@ class FriendlyFontDialog : public QFontDialog void tst_QFontDialog::task256466_wrongStyle() { -#ifdef Q_OS_MAC - QSKIP("Test crashes on Mac OS X, see QTBUG-24321"); -#endif - QFontDatabase fdb; FriendlyFontDialog dialog; + dialog.setOption(QFontDialog::DontUseNativeDialog); QListView *familyList = reinterpret_cast<QListView*>(dialog.d_func()->familyList); QListView *styleList = reinterpret_cast<QListView*>(dialog.d_func()->styleList); QListView *sizeList = reinterpret_cast<QListView*>(dialog.d_func()->sizeList); diff --git a/tests/auto/widgets/dialogs/qinputdialog/tst_qinputdialog.cpp b/tests/auto/widgets/dialogs/qinputdialog/tst_qinputdialog.cpp index a38c2d070d..f6c10bc2e9 100644 --- a/tests/auto/widgets/dialogs/qinputdialog/tst_qinputdialog.cpp +++ b/tests/auto/widgets/dialogs/qinputdialog/tst_qinputdialog.cpp @@ -110,7 +110,7 @@ void testTypingValue( sbox->selectAll(); for (int i = 0; i < value.size(); ++i) { const QChar valChar = value[i]; - _keyClick(static_cast<QWidget *>(sbox), valChar.toAscii()); // ### always guaranteed to work? + _keyClick(static_cast<QWidget *>(sbox), valChar.toLatin1()); // ### always guaranteed to work? if (sbox->hasAcceptableInput()) QVERIFY(okButton->isEnabled()); else @@ -123,7 +123,7 @@ void testTypingValue(QLineEdit *ledit, QPushButton *okButton, const QString &val ledit->selectAll(); for (int i = 0; i < value.size(); ++i) { const QChar valChar = value[i]; - _keyClick(ledit, valChar.toAscii()); // ### always guaranteed to work? + _keyClick(ledit, valChar.toLatin1()); // ### always guaranteed to work? QVERIFY(ledit->hasAcceptableInput()); QVERIFY(okButton->isEnabled()); } diff --git a/tests/auto/widgets/effects/qgraphicseffect/qgraphicseffect.pro b/tests/auto/widgets/effects/qgraphicseffect/qgraphicseffect.pro index d21ff564dd..177d1a7c42 100644 --- a/tests/auto/widgets/effects/qgraphicseffect/qgraphicseffect.pro +++ b/tests/auto/widgets/effects/qgraphicseffect/qgraphicseffect.pro @@ -5,4 +5,3 @@ QT += widgets widgets-private testlib QT += core-private gui-private SOURCES += tst_qgraphicseffect.cpp -CONFIG += parallel_test diff --git a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp index 97feb642dc..7687fd4b67 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp @@ -167,7 +167,7 @@ public: { setContentsMargins( 0,0,0,0 ); if (name.isEmpty()) - setData(0, QString::fromAscii("w%1").arg(quintptr(this))); + setData(0, QString::fromLatin1("w%1").arg(quintptr(this))); else setData(0, name); } @@ -1711,7 +1711,7 @@ void tst_QGraphicsAnchorLayout1::testBasicLayout() // Create dummy widgets QList<QGraphicsWidget *> widgets; for (int i = 0; i < widgetCount; ++i) { - TestWidget *w = new TestWidget(0, QString::fromAscii("W%1").arg(i)); + TestWidget *w = new TestWidget(0, QString::fromLatin1("W%1").arg(i)); widgets << w; } diff --git a/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp index 51ce7f909c..5da996bd59 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp @@ -458,7 +458,7 @@ void tst_QGraphicsGridLayout::addItem_data() int column = b; int rowSpan = c; int columnSpan = d; - QString name = QString::fromAscii("(%1,%2,%3,%4").arg(a).arg(b).arg(c).arg(d); + QString name = QString::fromLatin1("(%1,%2,%3,%4").arg(a).arg(b).arg(c).arg(d); Qt::Alignment alignment = Qt::AlignLeft; QTest::newRow(name.toLatin1()) << row << column << rowSpan << columnSpan << alignment; }}}} @@ -1114,7 +1114,7 @@ void tst_QGraphicsGridLayout::itemAt() if (i >= 0 && i < layout->count()) { QVERIFY(layout->itemAt(i)); } else { - QTest::ignoreMessage(QtWarningMsg, QString::fromAscii("QGraphicsGridLayout::itemAt: invalid index %1").arg(i).toLatin1().constData()); + QTest::ignoreMessage(QtWarningMsg, QString::fromLatin1("QGraphicsGridLayout::itemAt: invalid index %1").arg(i).toLatin1().constData()); QCOMPARE(layout->itemAt(i), static_cast<QGraphicsLayoutItem*>(0)); } } @@ -1146,7 +1146,7 @@ void tst_QGraphicsGridLayout::removeAt() layout->removeAt(0); QCOMPARE(item0->parentLayoutItem(), static_cast<QGraphicsLayoutItem *>(0)); QCOMPARE(layout->count(), 0); - QTest::ignoreMessage(QtWarningMsg, QString::fromAscii("QGraphicsGridLayout::removeAt: invalid index 0").toLatin1().constData()); + QTest::ignoreMessage(QtWarningMsg, QString::fromLatin1("QGraphicsGridLayout::removeAt: invalid index 0").toLatin1().constData()); layout->removeAt(0); QCOMPARE(layout->count(), 0); delete widget; @@ -1169,11 +1169,11 @@ void tst_QGraphicsGridLayout::removeItem() QCOMPARE(l->count(), 4); // Avoid crashing. Note that the warning message might change in the future. - QTest::ignoreMessage(QtWarningMsg, QString::fromAscii("QGraphicsGridLayout::removeAt: invalid index -1").toLatin1().constData()); + QTest::ignoreMessage(QtWarningMsg, QString::fromLatin1("QGraphicsGridLayout::removeAt: invalid index -1").toLatin1().constData()); l->removeItem(0); QCOMPARE(l->count(), 4); - QTest::ignoreMessage(QtWarningMsg, QString::fromAscii("QGraphicsGridLayout::removeAt: invalid index -1").toLatin1().constData()); + QTest::ignoreMessage(QtWarningMsg, QString::fromLatin1("QGraphicsGridLayout::removeAt: invalid index -1").toLatin1().constData()); l->removeItem(new QGraphicsWidget); QCOMPARE(l->count(), 4); } diff --git a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp index 639a1f61a9..a6f846045f 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp @@ -2219,7 +2219,7 @@ void tst_QGraphicsItem::setMatrix() QApplication::instance()->processEvents(); QCOMPARE(spy.count(), 3); - QList<QRectF> rlist = qVariantValue<QList<QRectF> >(spy.last().at(0)); + QList<QRectF> rlist = qvariant_cast<QList<QRectF> >(spy.last().at(0)); QCOMPARE(rlist.size(), 3); QCOMPARE(rlist.at(0), rotatedRect); // From item.setMatrix() (clearing rotated rect) @@ -4450,13 +4450,13 @@ protected: break; case QGraphicsItem::ItemMatrixChange: { QVariant variant; - qVariantSetValue<QMatrix>(variant, matrix()); + variant.setValue<QMatrix>(matrix()); oldValues << variant; } break; case QGraphicsItem::ItemTransformChange: { QVariant variant; - qVariantSetValue<QTransform>(variant, transform()); + variant.setValue<QTransform>(transform()); oldValues << variant; } break; @@ -4478,7 +4478,7 @@ protected: case QGraphicsItem::ItemSelectedHasChanged: break; case QGraphicsItem::ItemParentChange: - oldValues << qVariantFromValue<void *>(parentItem()); + oldValues << QVariant::fromValue<void *>(parentItem()); break; case QGraphicsItem::ItemParentHasChanged: break; @@ -4489,11 +4489,11 @@ protected: oldValues << children().size(); break; case QGraphicsItem::ItemSceneChange: - oldValues << qVariantFromValue<QGraphicsScene *>(scene()); + oldValues << QVariant::fromValue<QGraphicsScene *>(scene()); if (itemSceneChangeTargetScene - && qVariantValue<QGraphicsScene *>(value) - && itemSceneChangeTargetScene != qVariantValue<QGraphicsScene *>(value)) { - return qVariantFromValue<QGraphicsScene *>(itemSceneChangeTargetScene); + && qvariant_cast<QGraphicsScene *>(value) + && itemSceneChangeTargetScene != qvariant_cast<QGraphicsScene *>(value)) { + return QVariant::fromValue<QGraphicsScene *>(itemSceneChangeTargetScene); } return value; case QGraphicsItem::ItemSceneHasChanged: @@ -4573,17 +4573,17 @@ void tst_QGraphicsItem::itemChange() } { // ItemMatrixChange / ItemTransformHasChanged - qVariantSetValue<QMatrix>(tester.itemChangeReturnValue, QMatrix().rotate(90)); + tester.itemChangeReturnValue.setValue<QMatrix>(QMatrix().rotate(90)); tester.setMatrix(QMatrix().translate(50, 0), true); ++changeCount; // notification sent too QCOMPARE(tester.changes.size(), ++changeCount); QCOMPARE(int(tester.changes.at(tester.changes.size() - 2)), int(QGraphicsItem::ItemMatrixChange)); QCOMPARE(int(tester.changes.last()), int(QGraphicsItem::ItemTransformHasChanged)); - QCOMPARE(qVariantValue<QMatrix>(tester.values.at(tester.values.size() - 2)), + QCOMPARE(qvariant_cast<QMatrix>(tester.values.at(tester.values.size() - 2)), QMatrix().translate(50, 0)); QCOMPARE(tester.values.last(), QVariant(QTransform(QMatrix().rotate(90)))); QVariant variant; - qVariantSetValue<QMatrix>(variant, QMatrix()); + variant.setValue<QMatrix>(QMatrix()); QCOMPARE(tester.oldValues.last(), variant); QCOMPARE(tester.matrix(), QMatrix().rotate(90)); } @@ -4593,19 +4593,19 @@ void tst_QGraphicsItem::itemChange() ++changeCount; // notification sent too // ItemTransformChange / ItemTransformHasChanged - qVariantSetValue<QTransform>(tester.itemChangeReturnValue, QTransform().rotate(90)); + tester.itemChangeReturnValue.setValue<QTransform>(QTransform().rotate(90)); tester.translate(50, 0); ++changeCount; // notification sent too ++changeCount; QCOMPARE(tester.changes.size(), changeCount); QCOMPARE(tester.changes.at(tester.changes.size() - 2), QGraphicsItem::ItemTransformChange); QCOMPARE(tester.changes.at(tester.changes.size() - 1), QGraphicsItem::ItemTransformHasChanged); - QCOMPARE(qVariantValue<QTransform>(tester.values.at(tester.values.size() - 2)), + QCOMPARE(qvariant_cast<QTransform>(tester.values.at(tester.values.size() - 2)), QTransform().translate(50, 0)); - QCOMPARE(qVariantValue<QTransform>(tester.values.at(tester.values.size() - 1)), + QCOMPARE(qvariant_cast<QTransform>(tester.values.at(tester.values.size() - 1)), QTransform().rotate(90)); QVariant variant; - qVariantSetValue<QTransform>(variant, QTransform()); + variant.setValue<QTransform>(QTransform()); QCOMPARE(tester.oldValues.last(), variant); QCOMPARE(tester.transform(), QTransform().rotate(90)); } @@ -4690,9 +4690,9 @@ void tst_QGraphicsItem::itemChange() QCOMPARE(tester.changes.size(), changeCount); QCOMPARE(tester.changes.at(tester.changes.size() - 2), QGraphicsItem::ItemFlagsChange); QCOMPARE(tester.changes.at(tester.changes.size() - 1), QGraphicsItem::ItemFlagsHaveChanged); - QVariant expectedFlags = qVariantFromValue<quint32>(QGraphicsItem::GraphicsItemFlags(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemSendsGeometryChanges)); + QVariant expectedFlags = QVariant::fromValue<quint32>(QGraphicsItem::GraphicsItemFlags(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemSendsGeometryChanges)); QCOMPARE(tester.values.at(tester.values.size() - 2), expectedFlags); - QCOMPARE(tester.values.at(tester.values.size() - 1), qVariantFromValue<quint32>((quint32)QGraphicsItem::ItemIsSelectable)); + QCOMPARE(tester.values.at(tester.values.size() - 1), QVariant::fromValue<quint32>((quint32)QGraphicsItem::ItemIsSelectable)); } { // ItemSelectedChange @@ -4739,12 +4739,12 @@ void tst_QGraphicsItem::itemChange() } { // ItemParentChange - qVariantSetValue<QGraphicsItem *>(tester.itemChangeReturnValue, 0); + tester.itemChangeReturnValue.setValue<QGraphicsItem *>(0); tester.setParentItem(&testerHelper); QCOMPARE(tester.changes.size(), ++changeCount); QCOMPARE(tester.changes.last(), QGraphicsItem::ItemParentChange); - QCOMPARE(qVariantValue<QGraphicsItem *>(tester.values.last()), (QGraphicsItem *)&testerHelper); - QCOMPARE(qVariantValue<QGraphicsItem *>(tester.oldValues.last()), (QGraphicsItem *)0); + QCOMPARE(qvariant_cast<QGraphicsItem *>(tester.values.last()), (QGraphicsItem *)&testerHelper); + QCOMPARE(qvariant_cast<QGraphicsItem *>(tester.oldValues.last()), (QGraphicsItem *)0); QCOMPARE(tester.parentItem(), (QGraphicsItem *)0); } { @@ -4771,14 +4771,14 @@ void tst_QGraphicsItem::itemChange() testerHelper.setParentItem(&tester); QCOMPARE(tester.changes.size(), ++changeCount); QCOMPARE(tester.changes.last(), QGraphicsItem::ItemChildAddedChange); - QCOMPARE(qVariantValue<QGraphicsItem *>(tester.values.last()), (QGraphicsItem *)&testerHelper); + QCOMPARE(qvariant_cast<QGraphicsItem *>(tester.values.last()), (QGraphicsItem *)&testerHelper); } { // ItemChildRemovedChange 1 testerHelper.setParentItem(0); QCOMPARE(tester.changes.size(), ++changeCount); QCOMPARE(tester.changes.last(), QGraphicsItem::ItemChildRemovedChange); - QCOMPARE(qVariantValue<QGraphicsItem *>(tester.values.last()), (QGraphicsItem *)&testerHelper); + QCOMPARE(qvariant_cast<QGraphicsItem *>(tester.values.last()), (QGraphicsItem *)&testerHelper); // ItemChildRemovedChange 1 ItemChangeTester *test = new ItemChangeTester; @@ -4819,10 +4819,10 @@ void tst_QGraphicsItem::itemChange() ItemChangeTester *child = new ItemChangeTester; child->setParentItem(&parent); QCOMPARE(parent.changes.last(), QGraphicsItem::ItemChildAddedChange); - QCOMPARE(qVariantValue<QGraphicsItem *>(parent.values.last()), (QGraphicsItem *)child); + QCOMPARE(qvariant_cast<QGraphicsItem *>(parent.values.last()), (QGraphicsItem *)child); delete child; QCOMPARE(parent.changes.last(), QGraphicsItem::ItemChildRemovedChange); - QCOMPARE(qVariantValue<QGraphicsItem *>(parent.values.last()), (QGraphicsItem *)child); + QCOMPARE(qvariant_cast<QGraphicsItem *>(parent.values.last()), (QGraphicsItem *)child); } { // !!! Note: If this test crashes because of double-deletion, there's @@ -4841,8 +4841,8 @@ void tst_QGraphicsItem::itemChange() QCOMPARE(tester.changes.at(tester.changes.size() - 1), QGraphicsItem::ItemSceneHasChanged); // Item's old value was 0 // Item's current value is scene - QCOMPARE(qVariantValue<QGraphicsScene *>(tester.oldValues.last()), (QGraphicsScene *)0); - QCOMPARE(qVariantValue<QGraphicsScene *>(tester.values.last()), (QGraphicsScene *)&scene); + QCOMPARE(qvariant_cast<QGraphicsScene *>(tester.oldValues.last()), (QGraphicsScene *)0); + QCOMPARE(qvariant_cast<QGraphicsScene *>(tester.values.last()), (QGraphicsScene *)&scene); scene2.addItem(&tester); ++changeCount; // ItemSceneChange (0) was: (scene) ++changeCount; // ItemSceneHasChanged (0) @@ -4858,16 +4858,16 @@ void tst_QGraphicsItem::itemChange() // Item's last old value was scene // Item's last current value is 0 - QCOMPARE(qVariantValue<QGraphicsScene *>(tester.oldValues.at(tester.oldValues.size() - 2)), (QGraphicsScene *)&scene); - QCOMPARE(qVariantValue<QGraphicsScene *>(tester.oldValues.at(tester.oldValues.size() - 1)), (QGraphicsScene *)0); - QCOMPARE(qVariantValue<QGraphicsScene *>(tester.values.at(tester.values.size() - 4)), (QGraphicsScene *)0); - QCOMPARE(qVariantValue<QGraphicsScene *>(tester.values.at(tester.values.size() - 3)), (QGraphicsScene *)0); - QCOMPARE(qVariantValue<QGraphicsScene *>(tester.values.at(tester.values.size() - 2)), (QGraphicsScene *)&scene2); - QCOMPARE(qVariantValue<QGraphicsScene *>(tester.values.at(tester.values.size() - 1)), (QGraphicsScene *)&scene2); + QCOMPARE(qvariant_cast<QGraphicsScene *>(tester.oldValues.at(tester.oldValues.size() - 2)), (QGraphicsScene *)&scene); + QCOMPARE(qvariant_cast<QGraphicsScene *>(tester.oldValues.at(tester.oldValues.size() - 1)), (QGraphicsScene *)0); + QCOMPARE(qvariant_cast<QGraphicsScene *>(tester.values.at(tester.values.size() - 4)), (QGraphicsScene *)0); + QCOMPARE(qvariant_cast<QGraphicsScene *>(tester.values.at(tester.values.size() - 3)), (QGraphicsScene *)0); + QCOMPARE(qvariant_cast<QGraphicsScene *>(tester.values.at(tester.values.size() - 2)), (QGraphicsScene *)&scene2); + QCOMPARE(qvariant_cast<QGraphicsScene *>(tester.values.at(tester.values.size() - 1)), (QGraphicsScene *)&scene2); // Item's last old value was 0 // Item's last current value is scene2 - QCOMPARE(qVariantValue<QGraphicsScene *>(tester.oldValues.last()), (QGraphicsScene *)0); - QCOMPARE(qVariantValue<QGraphicsScene *>(tester.values.last()), (QGraphicsScene *)&scene2); + QCOMPARE(qvariant_cast<QGraphicsScene *>(tester.oldValues.last()), (QGraphicsScene *)0); + QCOMPARE(qvariant_cast<QGraphicsScene *>(tester.values.last()), (QGraphicsScene *)&scene2); scene2.removeItem(&tester); ++changeCount; // ItemSceneChange (0) was: (scene2) @@ -4879,9 +4879,9 @@ void tst_QGraphicsItem::itemChange() QCOMPARE(tester.changes.at(tester.changes.size() - 1), QGraphicsItem::ItemSceneHasChanged); // Item's last old value was scene2 // Item's last current value is 0 - QCOMPARE(qVariantValue<QGraphicsScene *>(tester.oldValues.last()), (QGraphicsScene *)&scene2); - QCOMPARE(qVariantValue<QGraphicsScene *>(tester.values.at(tester.values.size() - 2)), (QGraphicsScene *)0); - QCOMPARE(qVariantValue<QGraphicsScene *>(tester.values.at(tester.values.size() - 1)), (QGraphicsScene *)0); + QCOMPARE(qvariant_cast<QGraphicsScene *>(tester.oldValues.last()), (QGraphicsScene *)&scene2); + QCOMPARE(qvariant_cast<QGraphicsScene *>(tester.values.at(tester.values.size() - 2)), (QGraphicsScene *)0); + QCOMPARE(qvariant_cast<QGraphicsScene *>(tester.values.at(tester.values.size() - 1)), (QGraphicsScene *)0); tester.itemSceneChangeTargetScene = &scene; scene2.addItem(&tester); @@ -4890,9 +4890,9 @@ void tst_QGraphicsItem::itemChange() ++changeCount; // ItemSceneHasChanged (scene) QCOMPARE(tester.values.size(), changeCount); - QCOMPARE(qVariantValue<QGraphicsScene *>(tester.values.at(tester.values.size() - 3)), (QGraphicsScene *)&scene2); - QCOMPARE(qVariantValue<QGraphicsScene *>(tester.values.at(tester.values.size() - 2)), (QGraphicsScene *)&scene); - QCOMPARE(qVariantValue<QGraphicsScene *>(tester.values.at(tester.values.size() - 1)), (QGraphicsScene *)&scene); + QCOMPARE(qvariant_cast<QGraphicsScene *>(tester.values.at(tester.values.size() - 3)), (QGraphicsScene *)&scene2); + QCOMPARE(qvariant_cast<QGraphicsScene *>(tester.values.at(tester.values.size() - 2)), (QGraphicsScene *)&scene); + QCOMPARE(qvariant_cast<QGraphicsScene *>(tester.values.at(tester.values.size() - 1)), (QGraphicsScene *)&scene); QCOMPARE(tester.scene(), &scene); tester.itemSceneChangeTargetScene = 0; diff --git a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/qgraphicsproxywidget.pro b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/qgraphicsproxywidget.pro index f2bd7bde70..7fd6db1dd6 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/qgraphicsproxywidget.pro +++ b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/qgraphicsproxywidget.pro @@ -6,7 +6,4 @@ QT += core-private gui-private SOURCES += tst_qgraphicsproxywidget.cpp -# ### fixme: QTBUG-20756 crashes on xcb -contains(QT_CONFIG,xcb):CONFIG+=insignificant_test - -win32:CONFIG += insignificant_test # QTBUG-24294 +contains(QT_CONFIG,xcb):CONFIG+=insignificant_test # QTBUG-25294 diff --git a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp index fef21c19f7..2b143c5d98 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp @@ -1498,6 +1498,9 @@ void tst_QGraphicsProxyWidget::scrollUpdate() // QRect(0, 0, 200, 12) is the first update, expanded (-2, -2, 2, 2) // QRect(0, 12, 102, 10) is the scroll update, expanded (-2, -2, 2, 2), // intersected with the above update. +#ifdef Q_OS_WIN + QEXPECT_FAIL("", "QTBUG-24294", Abort); +#endif QCOMPARE(view.paintEventRegion.rects(), QVector<QRect>() << QRect(0, 0, 200, 12) << QRect(0, 12, 102, 10)); QCOMPARE(widget->npaints, 2); @@ -2472,6 +2475,9 @@ void tst_QGraphicsProxyWidget::popup_basic() QTest::mousePress(view.viewport(), Qt::LeftButton, 0, view.mapFromScene(proxy->mapToScene(proxy->boundingRect().center()))); +#ifdef Q_OS_WIN + QEXPECT_FAIL("", "QTBUG-24294", Abort); +#endif QTRY_COMPARE(box->pos(), QPoint()); QCOMPARE(proxy->childItems().count(), 1); @@ -3376,11 +3382,13 @@ void tst_QGraphicsProxyWidget::updateAndDelete() // Update and hide. proxy->update(); proxy->hide(); -#ifdef Q_OS_MAC - QEXPECT_FAIL("", "QTBUG-23700", Abort); +#ifdef Q_OS_WIN + QEXPECT_FAIL("", "QTBUG-24294", Abort); #endif - QTRY_COMPARE(view.npaints, 1); +#ifdef Q_OS_MAC + QEXPECT_FAIL("", "QTBUG-23700", Continue); +#endif QCOMPARE(view.paintEventRegion, expectedRegion); proxy->show(); diff --git a/tests/auto/widgets/graphicsview/qgraphicsscene/qgraphicsscene.pro b/tests/auto/widgets/graphicsview/qgraphicsscene/qgraphicsscene.pro index c0a9075d10..8a084472b8 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsscene/qgraphicsscene.pro +++ b/tests/auto/widgets/graphicsview/qgraphicsscene/qgraphicsscene.pro @@ -17,5 +17,3 @@ wince* { DEPLOYMENT += rootFiles renderFiles DEFINES += SRCDIR=\\\".\\\" } - -win32:CONFIG += insignificant_test # QTBUG-24295 diff --git a/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp b/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp index df529c6095..3686619fea 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp @@ -2830,7 +2830,7 @@ void tst_QGraphicsScene::update() // Check that the update region is correct QCOMPARE(spy.count(), 1); QRectF region; - foreach (QRectF rectF, qVariantValue<QList<QRectF> >(spy.at(0).at(0))) + foreach (QRectF rectF, qvariant_cast<QList<QRectF> >(spy.at(0).at(0))) region |= rectF; QCOMPARE(region, QRectF(-100, -100, 200, 200)); } diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/qgraphicsview.pro b/tests/auto/widgets/graphicsview/qgraphicsview/qgraphicsview.pro index 59ad89ed1f..20cff5500a 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsview/qgraphicsview.pro +++ b/tests/auto/widgets/graphicsview/qgraphicsview/qgraphicsview.pro @@ -6,7 +6,3 @@ QT += core-private gui-private SOURCES += tst_qgraphicsview.cpp tst_qgraphicsview_2.cpp DEFINES += QT_NO_CAST_TO_ASCII - -linux-*:system(". /etc/lsb-release && [ $DISTRIB_CODENAME = oneiric ]"):CONFIG+=insignificant_test # QTBUG-16063 - -win32|mac:CONFIG += insignificant_test # QTBUG-24296 diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp index 1838977749..156d815765 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp @@ -3423,6 +3423,9 @@ void tst_QGraphicsView::moveItemWhileScrolling() int a = adjustForAntialiasing ? 2 : 1; expectedRegion += QRect(40, 50, 10, 10).adjusted(-a, -a, a, a); expectedRegion += QRect(40, 60, 10, 10).adjusted(-a, -a, a, a); +#ifdef Q_OS_WIN + QEXPECT_FAIL("", "QTBUG-24296", Abort); +#endif COMPARE_REGIONS(view.lastPaintedRegion, expectedRegion); } @@ -4386,10 +4389,8 @@ void tst_QGraphicsView::task259503_scrollingArtifacts() if (itSTimeToTest) { -// qDebug() << event->region(); -// qDebug() << updateRegion; -#ifndef Q_OS_MAC - QEXPECT_FAIL("", "The event region doesn't include the original item position region. See QTBUG-4416", Continue); +#ifndef Q_OS_WIN + QEXPECT_FAIL("", "QTBUG-24296", Continue); #endif QCOMPARE(event->region(), updateRegion); } diff --git a/tests/auto/widgets/graphicsview/qgraphicswidget/qgraphicswidget.pro b/tests/auto/widgets/graphicsview/qgraphicswidget/qgraphicswidget.pro index 2fc45b48de..6acb63089e 100644 --- a/tests/auto/widgets/graphicsview/qgraphicswidget/qgraphicswidget.pro +++ b/tests/auto/widgets/graphicsview/qgraphicswidget/qgraphicswidget.pro @@ -6,4 +6,4 @@ QT += core-private gui-private SOURCES += tst_qgraphicswidget.cpp -linux-*:system(". /etc/lsb-release && [ $DISTRIB_CODENAME = oneiric ]"):CONFIG += insignificant_test # QTBUG-23616 +linux-*:system(". /etc/lsb-release && [ $DISTRIB_CODENAME = lucid ]"):DEFINES+=UBUNTU_LUCID # QTBUG-20778 diff --git a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp index 3c98f8936c..7a5aabe714 100644 --- a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp @@ -1515,7 +1515,7 @@ void tst_QGraphicsWidget::setTabOrderAndReparent() for (i = 1; i < 4; ++i) { QGraphicsWidget *wid = new QGraphicsWidget; wid->setFocusPolicy(Qt::StrongFocus); - wid->setData(0, QString::fromAscii("w%1").arg(i)); + wid->setData(0, QString::fromLatin1("w%1").arg(i)); scene.addItem(wid); if (i == 1) w1 = wid; @@ -1555,7 +1555,7 @@ void tst_QGraphicsWidget::setTabOrderAndReparent() for (i = 1; i < 5; ++i) { QGraphicsWidget *wid = new QGraphicsWidget; wid->setFocusPolicy(Qt::StrongFocus); - wid->setData(0, QString::fromAscii("w%1").arg(i)); + wid->setData(0, QString::fromLatin1("w%1").arg(i)); scene.addItem(wid); if (i == 1) w1 = wid; @@ -3191,7 +3191,7 @@ void tst_QGraphicsWidget::initialShow2() view.show(); QTest::qWaitForWindowShown(&view); -#ifndef Q_OS_MAC +#if defined(Q_OS_WIN) || defined(UBUNTU_LUCID) QEXPECT_FAIL("", "QTBUG-20778", Abort); #endif QTRY_COMPARE(widget->repaints, expectedRepaintCount); @@ -3211,11 +3211,11 @@ void tst_QGraphicsWidget::itemChangeEvents() break; } case QEvent::ParentAboutToChange: { - valueDuringEvents.insert(QEvent::ParentAboutToChange, qVariantFromValue(parentItem())); + valueDuringEvents.insert(QEvent::ParentAboutToChange, QVariant::fromValue(parentItem())); break; } case QEvent::ParentChange: { - valueDuringEvents.insert(QEvent::ParentChange, qVariantFromValue(parentItem())); + valueDuringEvents.insert(QEvent::ParentChange, QVariant::fromValue(parentItem())); break; } case QEvent::CursorChange: { @@ -3252,10 +3252,10 @@ void tst_QGraphicsWidget::itemChangeEvents() TestGraphicsWidget *item = new TestGraphicsWidget; item->setParentItem(parent); // ParentAboutToChange should be triggered before the parent has changed - QTRY_COMPARE(qVariantValue<QGraphicsItem *>(item->valueDuringEvents.value(QEvent::ParentAboutToChange)), + QTRY_COMPARE(qvariant_cast<QGraphicsItem *>(item->valueDuringEvents.value(QEvent::ParentAboutToChange)), static_cast<QGraphicsItem *>(0)); // ParentChange should be triggered after the parent has changed - QTRY_COMPARE(qVariantValue<QGraphicsItem *>(item->valueDuringEvents.value(QEvent::ParentChange)), + QTRY_COMPARE(qvariant_cast<QGraphicsItem *>(item->valueDuringEvents.value(QEvent::ParentChange)), static_cast<QGraphicsItem *>(parent)); // ShowEvent should be triggered before the item is shown diff --git a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp index 1518403a64..3846433e29 100644 --- a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp +++ b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp @@ -1545,7 +1545,7 @@ public: return QVariant(); } if (role == Qt::DisplayRole) { - return QString::fromAscii("%1,%2").arg(index.row()).arg(index.column()); + return QString::fromLatin1("%1,%2").arg(index.row()).arg(index.column()); } return QVariant(); } diff --git a/tests/auto/widgets/itemviews/qitemdelegate/qitemdelegate.pro b/tests/auto/widgets/itemviews/qitemdelegate/qitemdelegate.pro index d1a7686637..d90f6fd154 100644 --- a/tests/auto/widgets/itemviews/qitemdelegate/qitemdelegate.pro +++ b/tests/auto/widgets/itemviews/qitemdelegate/qitemdelegate.pro @@ -4,5 +4,3 @@ QT += widgets testlib SOURCES += tst_qitemdelegate.cpp win32:!wince*: LIBS += -lUser32 - -linux-*:system(". /etc/lsb-release && [ $DISTRIB_CODENAME = oneiric ]"):CONFIG+=insignificant_test # QTBUG-23637 diff --git a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp index 9bb08edcce..be649db9d8 100644 --- a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp +++ b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp @@ -1277,7 +1277,7 @@ void tst_QListView::scrollBarRanges() QStringListModel model(&lv); QStringList list; for (int i = 0; i < rowCount; ++i) - list << QString::fromAscii("Item %1").arg(i); + list << QString::fromLatin1("Item %1").arg(i); model.setStringList(list); lv.setModel(&model); @@ -1375,7 +1375,7 @@ void tst_QListView::scrollBarAsNeeded() QStringList list; int i; for (i = 0; i < rowCounts[r]; ++i) - list << QString::fromAscii("Item %1").arg(i); + list << QString::fromLatin1("Item %1").arg(i); model.setStringList(list); QApplication::processEvents(); @@ -1383,7 +1383,7 @@ void tst_QListView::scrollBarAsNeeded() QStringList replacement; for (i = 0; i < itemCount; ++i) { - replacement << QString::fromAscii("Item %1").arg(i); + replacement << QString::fromLatin1("Item %1").arg(i); } model.setStringList(replacement); @@ -2059,7 +2059,7 @@ void tst_QListView::taskQTBUG_12308_wrongFlowLayout() QListWidgetItem *item = new QListWidgetItem(); item->setText(QString("Item %L1").arg(i)); lw.addItem(item); - if (!item->text().contains(QString::fromAscii("1"))) + if (!item->text().contains(QString::fromLatin1("1"))) item->setHidden(true); } lw.show(); diff --git a/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp b/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp index 35e13e2f0a..afc24cd493 100644 --- a/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp +++ b/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp @@ -1667,6 +1667,8 @@ void tst_QListWidget::QTBUG14363_completerWithAnyKeyPressedEditTriggers() listWidget.show(); listWidget.setCurrentItem(item); QTest::qWaitForWindowShown(&listWidget); + listWidget.setFocus(); + QCOMPARE(qApp->focusWidget(), &listWidget); QTest::keyClick(listWidget.viewport(), Qt::Key_C); diff --git a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp index e1f175ad1b..6c082fe35f 100644 --- a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp +++ b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp @@ -210,6 +210,8 @@ private slots: void indexRowSizeHint(); void addRowsWhileSectionsAreHidden(); void filterProxyModelCrash(); + void renderToPixmap_data(); + void renderToPixmap(); void styleOptionViewItem(); void keyboardNavigationWithDisabled(); @@ -2125,12 +2127,12 @@ void tst_QTreeView::resizeColumnToContents() for (int r = 0; r < model.rowCount(); ++r) { for (int c = 0; c < model.columnCount(); ++c) { QModelIndex idx = model.index(r, c); - model.setData(idx, QString::fromAscii("%1,%2").arg(r).arg(c) ); + model.setData(idx, QString::fromLatin1("%1,%2").arg(r).arg(c) ); model.insertColumns(0, 2, idx); model.insertRows(0, 6, idx); for (int i = 0; i < 6; ++i) { for (int j = 0; j < 2 ; ++j) { - model.setData(model.index(i, j, idx), QString::fromAscii("child%1%2").arg(i).arg(j)); + model.setData(model.index(i, j, idx), QString::fromLatin1("child%1%2").arg(i).arg(j)); } } } @@ -2890,6 +2892,37 @@ void tst_QTreeView::filterProxyModelCrash() view.repaint(); //used to crash } +void tst_QTreeView::renderToPixmap_data() +{ + QTest::addColumn<int>("row"); + QTest::newRow("row-0") << 0; + QTest::newRow("row-1") << 1; +} + +void tst_QTreeView::renderToPixmap() +{ + QFETCH(int, row); + PublicView view; + QStandardItemModel model; + + model.appendRow(new QStandardItem("Spanning")); + model.appendRow(QList<QStandardItem*>() << new QStandardItem("Not") << new QStandardItem("Spanning")); + + view.setModel(&model); + view.setFirstColumnSpanned(0, QModelIndex(), true); + +#ifdef QT_BUILD_INTERNAL + { + // We select the index at row=0 because it spans the + // column (regression test for an assert) + // We select the index at row=1 for coverage. + QItemSelection sel(model.index(row,0), model.index(row,1)); + QRect rect; + view.aiv_priv()->renderToPixmap(sel.indexes(), &rect); + } +#endif +} + void tst_QTreeView::styleOptionViewItem() { class MyDelegate : public QStyledItemDelegate @@ -2990,6 +3023,22 @@ void tst_QTreeView::styleOptionViewItem() view.setFirstColumnSpanned(2, QModelIndex(), true); view.setAlternatingRowColors(true); +#ifdef QT_BUILD_INTERNAL + { + // Test the rendering to pixmap before painting the widget. + // The rendering to pixmap should not depend on having been + // painted already yet. + delegate.count = 0; + QItemSelection sel(model.index(0,0), model.index(0,modelColumns-1)); + QRect rect; + view.aiv_priv()->renderToPixmap(sel.indexes(), &rect); + if (delegate.count != visibleColumns) { + qDebug() << rect << view.rect() << view.isVisible(); + } + QTRY_COMPARE(delegate.count, visibleColumns); + } +#endif + delegate.count = 0; delegate.allCollapsed = true; view.showMaximized(); @@ -3011,7 +3060,10 @@ void tst_QTreeView::styleOptionViewItem() QItemSelection sel(model.index(0,0), model.index(0,modelColumns-1)); QRect rect; view.aiv_priv()->renderToPixmap(sel.indexes(), &rect); - QTRY_VERIFY(delegate.count == visibleColumns); + if (delegate.count != visibleColumns) { + qDebug() << rect << view.rect() << view.isVisible(); + } + QTRY_COMPARE(delegate.count, visibleColumns); #endif //test dynamic models diff --git a/tests/auto/widgets/kernel/kernel.pro b/tests/auto/widgets/kernel/kernel.pro index cf909b7e87..e1c245d9d1 100644 --- a/tests/auto/widgets/kernel/kernel.pro +++ b/tests/auto/widgets/kernel/kernel.pro @@ -17,5 +17,3 @@ SUBDIRS=\ qshortcut \ SUBDIRS -= qsound - -mac: qwidget.CONFIG += no_check_target # crashes, see QTBUG-23695 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); diff --git a/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp b/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp index c43ea065f3..6b424ab4b4 100644 --- a/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp +++ b/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp @@ -540,7 +540,7 @@ public: } private: void init(int numPixels = -1){ - setText(QString::fromAscii("(%1,%2)").arg(sh.width()).arg(sh.height())); + setText(QString::fromLatin1("(%1,%2)").arg(sh.width()).arg(sh.height())); setFrameStyle(QFrame::Box | QFrame::Plain); setNumberOfPixels(numPixels); } @@ -797,12 +797,12 @@ void tst_QGridLayout::minMaxSize_data() << SizeInfo(QPoint(10, 10), QSize( 90, 90), QSize(100,100)) << SizeInfo(QPoint(10 + 100 + 1, 10), QSize( 90, 90)) ); - QTest::newRow("2x1 grid, extend to minimumSize, motif") << QString::fromAscii("motif") << 2 << 1 + QTest::newRow("2x1 grid, extend to minimumSize, motif") << QString::fromLatin1("motif") << 2 << 1 << int(QSizePolicy::Preferred) << QSize() << (SizeInfoList() << SizeInfo(QPoint(11, 11), QSize( 90, 90), QSize(100,100)) << SizeInfo(QPoint(11 + 100 + 6, 11), QSize( 90, 90)) ); - QTest::newRow("2x1 grid, extend to minimumSize, windows") << QString::fromAscii("windows") << 2 << 1 + QTest::newRow("2x1 grid, extend to minimumSize, windows") << QString::fromLatin1("windows") << 2 << 1 << int(QSizePolicy::Preferred) << QSize() << (SizeInfoList() << SizeInfo(QPoint(11, 11), QSize( 90, 90), QSize(100,100)) << SizeInfo(QPoint(11 + 100 + 6, 11), QSize( 90, 90)) @@ -1430,7 +1430,7 @@ void tst_QGridLayout::layoutSpacingImplementation_data() w->setLayout(layout); int pw = up->sizeHint().width(); int ph = up->sizeHint().height(); - QByteArray testName = QString::fromAscii("arrowpad with %1 empty rows, %2 empty columns").arg(yoff).arg(xoff).toLatin1(); + QByteArray testName = QString::fromLatin1("arrowpad with %1 empty rows, %2 empty columns").arg(yoff).arg(xoff).toLatin1(); QTest::newRow(testName.data()) << w << (PointList() << QPoint(0 + pw + 5, 3) diff --git a/tests/auto/widgets/kernel/qshortcut/tst_qshortcut.cpp b/tests/auto/widgets/kernel/qshortcut/tst_qshortcut.cpp index 61efb6e3f3..971f60bb3e 100644 --- a/tests/auto/widgets/kernel/qshortcut/tst_qshortcut.cpp +++ b/tests/auto/widgets/kernel/qshortcut/tst_qshortcut.cpp @@ -580,8 +580,8 @@ void tst_QShortcut::text_data() Qt::UNICODE_ACCEL + Qt::Key_K */ /* see comments above on the #ifdef'ery */ - QTest::newRow("T06 - slot1") << SetupAccel << TriggerSlot1 << QString("\x0C5")<< 0 << 0 << 0 << 0 << 0 << 0 << 0 << 0 << NoResult; - QTest::newRow("T07 - slot2") << SetupAccel << TriggerSlot2 << QString("Shift+\x0C5")<< 0 << 0 << 0 << 0 << 0 << 0 << 0 << 0 << NoResult; + QTest::newRow("T06 - slot1") << SetupAccel << TriggerSlot1 << QString::fromLatin1("\x0C5")<< 0 << 0 << 0 << 0 << 0 << 0 << 0 << 0 << NoResult; + QTest::newRow("T07 - slot2") << SetupAccel << TriggerSlot2 << QString::fromLatin1("Shift+\x0C5")<< 0 << 0 << 0 << 0 << 0 << 0 << 0 << 0 << NoResult; QTest::newRow("T08 - slot2") << SetupAccel << TriggerSlot1 << QString("K") << 0 << 0 << 0 << 0 << 0 << 0 << 0 << 0 << NoResult; QTest::newRow("T:Qt::Key_aring") << TestAccel << NoWidget << QString("") << int(Qt::Key_Aring) << 0 << 0 << 0 << 0 << 0 << 0 << 0 << Slot1Triggered; QTest::newRow("T:Qt::Key_Aring") << TestAccel << NoWidget << QString("") << int(Qt::SHIFT+Qt::Key_Aring) << 0 << 0 << 0 << 0 << 0 << 0 << 0 << Slot2Triggered; @@ -1204,25 +1204,25 @@ void tst_QShortcut::sendKeyEvents(QWidget *w, int k1, QChar c1, int k2, QChar c2 k4 &= ~Qt::MODIFIER_MASK; - if (k1 || c1.toAscii()) { + if (k1 || c1.toLatin1()) { QString c(c1.unicode() == QChar::Null ? QString() : QString(c1)); QTest::sendKeyEvent(QTest::Press, w, static_cast<Qt::Key>(k1), c, b1); QTest::sendKeyEvent(QTest::Release, w, static_cast<Qt::Key>(k1), c, b1); } - if (k2 || c2.toAscii()) { + if (k2 || c2.toLatin1()) { QString c(c2.unicode() == QChar::Null ? QString() : QString(c2)); QTest::sendKeyEvent(QTest::Press, w, static_cast<Qt::Key>(k2), c, b2); QTest::sendKeyEvent(QTest::Release, w, static_cast<Qt::Key>(k2), c, b2); } - if (k3 || c3.toAscii()) { + if (k3 || c3.toLatin1()) { QString c(c3.unicode() == QChar::Null ? QString() : QString(c3)); QTest::sendKeyEvent(QTest::Press, w, static_cast<Qt::Key>(k3), c, b3); QTest::sendKeyEvent(QTest::Release, w, static_cast<Qt::Key>(k3), c, b3); } - if (k4 || c4.toAscii()) { + if (k4 || c4.toLatin1()) { QString c(c4.unicode() == QChar::Null ? QString() : QString(c4)); QTest::sendKeyEvent(QTest::Press, w, static_cast<Qt::Key>(k4), c, b4); QTest::sendKeyEvent(QTest::Release, w, static_cast<Qt::Key>(k4), c, b4); diff --git a/tests/auto/widgets/kernel/qwidget/qwidget.pro b/tests/auto/widgets/kernel/qwidget/qwidget.pro index 23fd2459bf..678796d2e5 100644 --- a/tests/auto/widgets/kernel/qwidget/qwidget.pro +++ b/tests/auto/widgets/kernel/qwidget/qwidget.pro @@ -21,4 +21,4 @@ x11 { !wince*:win32: LIBS += -luser32 -lgdi32 -CONFIG+=insignificant_test +CONFIG+=insignificant_test # QTBUG-25300, QTBUG-23695 diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp index 0c769d55da..6e88c6e74e 100644 --- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp +++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp @@ -66,6 +66,7 @@ #include <QtGui/qpaintengine.h> #include <QtGui/qbackingstore.h> #include <QtGui/qguiapplication.h> +#include <QtGui/qscreen.h> #include <qmenubar.h> #include <qtableview.h> #include <qtreewidget.h> @@ -73,17 +74,13 @@ #include <QtWidgets/QGraphicsView> #include <QtWidgets/QGraphicsProxyWidget> -#ifdef Q_WS_QWS -# include <qscreen_qws.h> -#endif - #if defined(Q_OS_MAC) #include "tst_qwidget_mac_helpers.h" // Abstract the ObjC stuff out so not everyone must run an ObjC++ compile. #endif #include <QtTest/QtTest> -#if defined(Q_OS_WIN) +#ifdef Q_OS_WIN # include <QtCore/qt_windows.h> # include <QtGui/private/qguiapplication_p.h> # include <QtGui/QPlatformNativeInterface> @@ -98,27 +95,32 @@ static HWND winHandleOf(const QWidget *w) qWarning() << "Cannot obtain native handle for " << w; return 0; } -#endif -#if defined(Q_WS_WIN) -# include <qt_windows.h> -# if !defined(Q_OS_WINCE) -#define Q_CHECK_PAINTEVENTS \ +# ifdef Q_OS_WINCE +# define Q_CHECK_PAINTEVENTS +# ifdef Q_OS_WINCE_WM +# include <qguifunctions_wince.h> +// taken from qguifunctions_wce.cpp +# define SPI_GETPLATFORMTYPE 257 +static bool qt_wince_is_platform(const QString &platformString) { + wchar_t tszPlatform[64]; + if (SystemParametersInfo(SPI_GETPLATFORMTYPE, + sizeof(tszPlatform)/sizeof(*tszPlatform),tszPlatform,0)) + if (0 == _tcsicmp(reinterpret_cast<const wchar_t *> (platformString.utf16()), tszPlatform)) + return true; + return false; +} +static inline bool qt_wince_is_smartphone() { return qt_wince_is_platform(QString::fromLatin1("Smartphone")); } +# endif // Q_OS_WINCE_WM +# else // Q_OS_WINCE +# define Q_CHECK_PAINTEVENTS \ if (::SwitchDesktop(::GetThreadDesktop(::GetCurrentThreadId())) == 0) \ QSKIP("desktop is not visible, this test would fail"); -# else -# define Q_CHECK_PAINTEVENTS -# endif -#elif defined(Q_WS_X11) -# include <private/qt_x11_p.h> -# include <qx11info_x11.h> -#elif defined(Q_WS_QWS) -# include <qwindowsystem_qws.h> -#endif +# endif // !Q_OS_WINCE +#else // Q_OS_WIN +# define Q_CHECK_PAINTEVENTS +#endif // else Q_OS_WIN -#if !defined(Q_WS_WIN) -#define Q_CHECK_PAINTEVENTS -#endif #if defined(Q_OS_WINCE_WM) #include <qguifunctions_wince.h> @@ -148,11 +150,6 @@ bool macHasAccessToWindowsServer() } #endif - -#if defined(Bool) -#undef Bool -#endif - class tst_QWidget : public QObject { Q_OBJECT @@ -187,24 +184,18 @@ private slots: void focusChainOnHide(); void focusChainOnReparent(); void setTabOrder(); -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN void activation(); #endif void reparent(); -#ifndef Q_WS_X11 void windowState(); -#endif void showMaximized(); void showFullScreen(); void showMinimized(); void showMinimizedKeepsFocus(); -#ifndef Q_WS_QWS void icon(); -#endif void hideWhenFocusWidgetIsChild(); -#ifndef Q_OS_IRIX void normalGeometry(); -#endif void setGeometry(); #ifndef Q_OS_WINCE void windowOpacity(); @@ -215,11 +206,9 @@ private slots: void stackUnder(); #endif void testContentsPropagation(); -#ifndef Q_OS_IRIX void saveRestoreGeometry(); void restoreVersion1Geometry_data(); void restoreVersion1Geometry(); -#endif void widgetAt(); #ifdef Q_OS_MAC @@ -257,17 +246,13 @@ private slots: void scroll(); #endif -#ifndef Q_WS_X11 // tests QWidget::setGeometry() void setWindowGeometry_data(); void setWindowGeometry(); -#endif -#if !defined(Q_WS_X11) && !defined(Q_OS_IRIX) // tests QWidget::move() and resize() void windowMoveResize_data(); void windowMoveResize(); -#endif void moveChild_data(); void moveChild(); @@ -277,12 +262,9 @@ private slots: void subtractOpaqueSiblings(); #endif -#ifdef Q_WS_WIN - void getDC(); -#ifndef Q_OS_WINCE +#if defined (Q_OS_WIN) && !defined(Q_OS_WINCE) void setGeometry_win(); #endif -#endif void setLocale(); void deleteStyle(); @@ -291,11 +273,10 @@ private slots: void setCursor(); void setToolTip(); void testWindowIconChangeEventPropagation(); -#ifdef Q_WS_X11 + void minAndMaxSizeWithX11BypassWindowManagerHint(); - void showHideShow(); + void showHideShowX11(); void clean_qt_x11_enforce_cursor(); -#endif void childEvents(); void render(); @@ -317,39 +298,30 @@ private slots: void setContentsMargins(); -#ifndef Q_OS_IRIX void moveWindowInShowEvent_data(); void moveWindowInShowEvent(); -#endif void repaintWhenChildDeleted(); void hideOpaqueChildWhileHidden(); -#if !defined(Q_OS_WINCE) && !defined(Q_WS_QWS) +#if !defined(Q_OS_WINCE) void updateWhileMinimized(); #endif -#if defined(Q_WS_WIN) || defined(Q_WS_X11) void alienWidgets(); -#endif void adjustSize(); void adjustSize_data(); void updateGeometry(); void updateGeometry_data(); void sendUpdateRequestImmediately(); -#ifndef Q_OS_IRIX void doubleRepaint(); -#endif void resizeInPaintEvent(); void opaqueChildren(); void setMaskInResizeEvent(); void moveInResizeEvent(); -#if defined(Q_WS_WIN) || defined(Q_WS_X11) - // We don't support immediate repaint right after show on - // other platforms. Must be compatible with Qt 4.3. void immediateRepaintAfterShow(); void immediateRepaintAfterInvalidateBuffer(); -#endif + void effectiveWinId(); void effectiveWinId2(); void customDpi(); @@ -358,15 +330,13 @@ private slots: void quitOnCloseAttribute(); void moveRect(); -#if defined (Q_WS_WIN) +#if defined (Q_OS_WIN) void gdiPainting(); void paintOnScreenPossible(); #endif void reparentStaticWidget(); void QTBUG6883_reparentStaticWidget2(); -#ifdef Q_WS_QWS - void updateOutsideSurfaceClip(); -#endif + void translucentWidget(); void setClearAndResizeMask(); @@ -415,21 +385,13 @@ private slots: private: bool ensureScreenSize(int width, int height); QWidget *testWidget; + + const QString m_platform; }; bool tst_QWidget::ensureScreenSize(int width, int height) { QSize available; -#ifdef Q_WS_QWS - available = QDesktopWidget().availableGeometry().size(); - if (available.width() < width || available.height() < height) { - QScreen *screen = QScreen::instance(); - if (!screen) - return false; - screen->setMode(width, height, screen->depth()); - } -#endif // Q_WS_QWS - available = QDesktopWidget().availableGeometry().size(); return (available.width() >= width && available.height() >= height); } @@ -455,9 +417,6 @@ void tst_QWidget::getSetCheck() obj1.setMinimumWidth(INT_MIN); QCOMPARE(obj1.minimumWidth(), 0); // A widgets width can never be less than 0 obj1.setMinimumWidth(INT_MAX); -#ifndef Q_WS_QWS //QWS doesn't allow toplevels to be bigger than the screen - QCOMPARE(obj1.minimumWidth(), QWIDGETSIZE_MAX); // The largest minimum size should only be as big as the maximium -#endif child1.setMinimumWidth(0); QCOMPARE(child1.minimumWidth(), 0); @@ -473,9 +432,6 @@ void tst_QWidget::getSetCheck() obj1.setMinimumHeight(INT_MIN); QCOMPARE(obj1.minimumHeight(), 0); // A widgets height can never be less than 0 obj1.setMinimumHeight(INT_MAX); -#ifndef Q_WS_QWS //QWS doesn't allow toplevels to be bigger than the screen - QCOMPARE(obj1.minimumHeight(), QWIDGETSIZE_MAX); // The largest minimum size should only be as big as the maximium -#endif child1.setMinimumHeight(0); QCOMPARE(child1.minimumHeight(), 0); @@ -577,15 +533,14 @@ void tst_QWidget::getSetCheck() QCOMPARE(true, obj1.autoFillBackground()); delete var1; -#if defined (Q_WS_WIN) && !defined(Q_OS_WINCE) +#if defined (Q_OS_WIN) && !defined(Q_OS_WINCE) obj1.setWindowFlags(Qt::FramelessWindowHint | Qt::WindowSystemMenuHint); - HWND handle = obj1.winId(); - long flags = GetWindowLong(handle, GWL_STYLE); - QVERIFY(flags & WS_POPUP); + const HWND handle = winHandleOf(&obj1); + QVERIFY(GetWindowLong(handle, GWL_STYLE) & WS_POPUP); #endif } -tst_QWidget::tst_QWidget() +tst_QWidget::tst_QWidget() : m_platform(qApp->platformName().toLower()) { QFont font; font.setBold(true); @@ -1685,11 +1640,7 @@ void tst_QWidget::setTabOrder() container.show(); container.activateWindow(); qApp->setActiveWindow(&container); -#ifdef Q_WS_X11 - QTest::qWaitForWindowShown(&container); - QTest::qWait(50); -#endif - + QTest::qWaitForWindowShown(container.windowHandle()); QTest::qWait(100); QTRY_VERIFY(lastEdit->hasFocus()); @@ -1703,7 +1654,7 @@ void tst_QWidget::setTabOrder() QVERIFY(firstEdit->hasFocus()); } -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN void tst_QWidget::activation() { Q_CHECK_PAINTEVENTS @@ -1740,7 +1691,7 @@ void tst_QWidget::activation() QVERIFY(qApp->activeWindow() == &widget1); widget2.showNormal(); QTest::qWait(waitTime); -#if defined(Q_WS_WIN) && !defined(Q_OS_WINCE) +#ifndef Q_OS_WINCE if (QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA) QEXPECT_FAIL("", "MS introduced new behavior after XP", Continue); #endif @@ -1750,12 +1701,12 @@ void tst_QWidget::activation() QTest::qWait(waitTime); QVERIFY(qApp->activeWindow() == &widget1); } -#endif +#endif // Q_OS_WIN -// Many window managers do not support window state properly, which causes this test to fail. -#ifndef Q_WS_X11 void tst_QWidget::windowState() { + if (m_platform == QStringLiteral("xcb")) + QSKIP("X11: Many window managers do not support window state properly, which causes this test to fail."); #ifdef Q_OS_WINCE_WM QPoint pos(500, 500); QSize size(200, 200); @@ -1873,7 +1824,6 @@ void tst_QWidget::windowState() QTRY_COMPARE(widget1.pos(), pos); QTRY_COMPARE(widget1.size(), size); } -#endif void tst_QWidget::showMaximized() { @@ -2217,13 +2167,7 @@ void tst_QWidget::showMinimizedKeepsFocus() window.showMinimized(); QTest::qWait(30); QTRY_VERIFY(window.isMinimized()); -#ifdef Q_WS_QWS - QEXPECT_FAIL("", "QWS does not implement showMinimized()", Continue); -#endif QCOMPARE(window.focusWidget(), static_cast<QWidget*>(0)); -#ifdef Q_WS_QWS - QEXPECT_FAIL("", "QWS does not implement showMinimized()", Continue); -#endif QTRY_COMPARE(qApp->focusWidget(), static_cast<QWidget*>(0)); window.showNormal(); @@ -2281,17 +2225,16 @@ void tst_QWidget::reparent() child.setGeometry(childPos.x(), childPos.y(), child.width(), child.height()); child.show(); -#ifdef Q_WS_X11 - // On X11, the window manager will apply NorthWestGravity rules to 'child', which - // means the top-left corner of the window frame will be placed at 'childPos', - // causing this test to fail -#else + if (m_platform == QStringLiteral("xcb")) + QEXPECT_FAIL("", "On X11, the window manager will apply NorthWestGravity rules to 'child', which" + " means the top-left corner of the window frame will be placed at 'childPos'" + " causing this test to fail.", Continue); + QCOMPARE(child.geometry().topLeft(), childPos); -#endif QTRY_COMPARE(childTLW.pos(), tlwPos); // This following part of the test only makes sense on Windows. -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN QWidget childTLWChild(&childTLW); childTLWChild.setObjectName("childTLWChild"); @@ -2314,17 +2257,17 @@ void tst_QWidget::reparent() QWidget grandChildTLWChild(&grandChildTLW); grandChildTLWChild.setObjectName("grandChildTLWChild"); - QVERIFY(IsWindow(childTLW.winId())); - QVERIFY(IsWindow(childTLWChild.winId())); - QVERIFY(IsWindow(grandChildTLW.winId())); - QVERIFY(IsWindow(grandChildTLWChild.winId())); + QVERIFY(IsWindow(winHandleOf(&childTLW))); + QVERIFY(IsWindow(winHandleOf(&childTLWChild))); + QVERIFY(IsWindow(winHandleOf(&grandChildTLW))); + QVERIFY(IsWindow(winHandleOf(&grandChildTLWChild))); parent.show(); - QVERIFY(IsWindow(childTLW.winId())); - QVERIFY(IsWindow(childTLWChild.winId())); - QVERIFY(IsWindow(grandChildTLW.winId())); - QVERIFY(IsWindow(grandChildTLWChild.winId())); + QVERIFY(IsWindow(winHandleOf(&childTLW))); + QVERIFY(IsWindow(winHandleOf(&childTLWChild))); + QVERIFY(IsWindow(winHandleOf(&grandChildTLW))); + QVERIFY(IsWindow(winHandleOf(&grandChildTLWChild))); child.setParent(&parent); child.move(10,10); @@ -2333,16 +2276,15 @@ void tst_QWidget::reparent() // this appears to stabelize results qApp->processEvents(); - QVERIFY(IsWindow(childTLW.winId())); - QVERIFY(IsWindow(childTLWChild.winId())); + QVERIFY(IsWindow(winHandleOf(&childTLW))); + QVERIFY(IsWindow(winHandleOf(&childTLWChild))); - QVERIFY(IsWindow(grandChildTLW.winId())); - QVERIFY(IsWindow(grandChildTLWChild.winId())); + QVERIFY(IsWindow(winHandleOf(&grandChildTLW))); + QVERIFY(IsWindow(winHandleOf(&grandChildTLWChild))); #endif } // Qt/Embedded does it differently. -#ifndef Q_WS_QWS void tst_QWidget::icon() { QPixmap p(20,20); @@ -2357,7 +2299,6 @@ void tst_QWidget::icon() testWidget->showNormal(); QVERIFY(!testWidget->windowIcon().isNull()); } -#endif void tst_QWidget::hideWhenFocusWidgetIsChild() { @@ -2378,10 +2319,9 @@ void tst_QWidget::hideWhenFocusWidgetIsChild() edit->setFocus(); qApp->processEvents(); QString actualFocusWidget, expectedFocusWidget; -#ifdef Q_WS_X11 - if (!qApp->focusWidget()) - QSKIP("Your window manager is too broken for this test"); -#endif + if (!qApp->focusWidget() && m_platform == QStringLiteral("xcb")) + QSKIP("X11: Your window manager is too broken for this test"); + QVERIFY(qApp->focusWidget()); actualFocusWidget.sprintf("%p %s %s", qApp->focusWidget(), qApp->focusWidget()->objectName().toLatin1().constData(), qApp->focusWidget()->metaObject()->className()); expectedFocusWidget.sprintf("%p %s %s", edit, edit->objectName().toLatin1().constData(), edit->metaObject()->className()); @@ -2397,8 +2337,6 @@ void tst_QWidget::hideWhenFocusWidgetIsChild() delete parentWidget; } -// 4DWM issues on IRIX makes this test fail. -#ifndef Q_OS_IRIX void tst_QWidget::normalGeometry() { QWidget parent; @@ -2500,7 +2438,6 @@ void tst_QWidget::normalGeometry() QTest::qWait(10); QTRY_COMPARE(parent.normalGeometry(), geom); } -#endif void tst_QWidget::setGeometry() { @@ -2835,17 +2772,13 @@ void tst_QWidget::stackUnder() parent->show(); QTest::qWaitForWindowShown(parent); QTest::qWait(10); -#ifdef Q_WS_QWS - QApplication::sendPostedEvents(); //glib workaround -#endif - QList<QObject *> list1; list1 << child1 << child2 << child3 << child4; QVERIFY(parent->children() == list1); foreach (UpdateWidget *child, allChildren) { int expectedPaintEvents = child == child4 ? 1 : 0; -#if defined(Q_WS_WIN) || defined(Q_OS_MAC) +#if defined(Q_OS_WIN) || defined(Q_OS_MAC) if (expectedPaintEvents == 1 && child->numPaintEvents == 2) QEXPECT_FAIL(0, "Mac and Windows issues double repaints for Z-Order change", Continue); #endif @@ -2944,13 +2877,9 @@ protected: void tst_QWidget::testContentsPropagation() { ContentsPropagationWidget widget; -#ifdef Q_WS_QWS - widget.resize(500,500); -#else widget.setFixedSize(500, 500); -#endif widget.setContentsPropagation(false); - QPixmap widgetSnapshot = QPixmap::grabWidget(&widget); + QPixmap widgetSnapshot = widget.grab(QRect(QPoint(0, 0), QSize(-1, -1))); QPixmap correct(500, 500); drawPolygon(&correct, 500, 500); @@ -2960,7 +2889,7 @@ void tst_QWidget::testContentsPropagation() QVERIFY(widgetSnapshot.toImage() != correct.toImage()); widget.setContentsPropagation(true); - widgetSnapshot = QPixmap::grabWidget(&widget); + widgetSnapshot = widgetSnapshot = widget.grab(QRect(QPoint(0, 0), QSize(-1, -1))); //widgetSnapshot.save("snap2.png", "PNG"); QCOMPARE(widgetSnapshot, correct); @@ -2970,8 +2899,7 @@ void tst_QWidget::testContentsPropagation() Test that saving and restoring window geometry with saveGeometry() and restoreGeometry() works. */ -// 4DWM issues on IRIX makes this test fail. -#ifndef Q_OS_IRIX + void tst_QWidget::saveRestoreGeometry() { const QPoint position(100, 100); @@ -3100,10 +3028,7 @@ void tst_QWidget::saveRestoreGeometry() QTRY_COMPARE(widget.geometry(), geom); } } -#endif -// 4DWM issues on IRIX makes this test fail. -#ifndef Q_OS_IRIX void tst_QWidget::restoreVersion1Geometry_data() { QTest::addColumn<QString>("fileName"); @@ -3178,9 +3103,7 @@ void tst_QWidget::restoreVersion1Geometry() widgetToSave.move(expectedPosition); widgetToSave.resize(expectedSize); widgetToSave.show(); -#ifdef Q_WS_X11 - qt_x11_wait_for_window_manager(&widget); -#endif + QTest::qWaitForWindowShown(widget.windowHandle()); QTest::qWait(500); // stabilize widgetToSave.setWindowState(Qt::WindowStates(expectedWindowState)); QTest::qWait(500); // stabilize @@ -3195,7 +3118,6 @@ void tst_QWidget::restoreVersion1Geometry() } #endif } -#endif void tst_QWidget::widgetAt() { @@ -3278,57 +3200,6 @@ void tst_QWidget::widgetAt() delete w1; } -#if defined(Q_WS_X11) -bool getProperty(Display *display, Window target, Atom type, Atom property, - unsigned char** data, unsigned long* count) -{ - Atom atom_return; - int size; - unsigned long nitems, bytes_left; - - int ret = XGetWindowProperty(display, target, property, - 0l, 1l, false, - type, &atom_return, &size, - &nitems, &bytes_left, data); - if (ret != Success || nitems < 1) - return false; - - if (bytes_left != 0) { - XFree(*data); - unsigned long remain = ((size / 8) * nitems) + bytes_left; - ret = XGetWindowProperty(display, target, - property, 0l, remain, false, - type, &atom_return, &size, - &nitems, &bytes_left, data); - if (ret != Success) - return false; - } - - *count = nitems; - return true; -} - -QString textPropertyToString(Display *display, XTextProperty& text_prop) -{ - QString ret; - if (text_prop.value && text_prop.nitems > 0) { - if (text_prop.encoding == XA_STRING) { - ret = reinterpret_cast<char *>(text_prop.value); - } else { - text_prop.nitems = strlen(reinterpret_cast<char *>(text_prop.value)); - char **list; - int num; - if (XmbTextPropertyToTextList(display, &text_prop, &list, &num) == Success - && num > 0 && *list) { - ret = QString::fromLocal8Bit(*list); - XFreeStringList(list); - } - } - } - return ret; -} -#endif - void tst_QWidget::task110173() { QWidget w; @@ -3491,7 +3362,7 @@ public: */ bool verifyWidgetMask(QWidget *widget, QRect mask) { - const QImage image = QPixmap::grabWindow(widget->winId()).toImage(); + const QImage image = widget->grab(QRect(QPoint(0, 0), widget->size())).toImage(); const QImage masked = image.copy(mask); QImage red(masked); @@ -3644,7 +3515,7 @@ void tst_QWidget::optimizedResizeMove() void tst_QWidget::optimizedResize_topLevel() { -#if defined(Q_OS_MAC) || defined(Q_WS_QWS) +#if defined(Q_OS_MAC) QSKIP("We do not yet have static contents support for *top-levels* on this platform"); #endif @@ -3659,7 +3530,7 @@ void tst_QWidget::optimizedResize_topLevel() topLevel.partial = false; topLevel.paintedRegion = QRegion(); -#ifndef Q_WS_WIN +#ifndef Q_OS_WIN topLevel.resize(topLevel.size() + QSize(10, 10)); #else // Static contents does not work when programmatically resizing @@ -3669,7 +3540,7 @@ void tst_QWidget::optimizedResize_topLevel() // WM_RESIZE in QApplication). This is a corner case, though. // See task 243708 const QRect frame = topLevel.frameGeometry(); - MoveWindow(topLevel.winId(), frame.x(), frame.y(), + MoveWindow(winHandleOf(&topLevel), frame.x(), frame.y(), frame.width() + 10, frame.height() + 10, true); #endif @@ -3709,28 +3580,10 @@ void tst_QWidget::childDeletesItsSibling() } -#ifdef Q_WS_QWS -# define SET_SAFE_SIZE(w) \ - do { \ - QSize safeSize(qt_screen->width() - 250, qt_screen->height() - 250); \ - if (!safeSize.isValid()) \ - QSKIP("Screen size too small"); \ - if (defaultSize.width() > safeSize.width() || defaultSize.height() > safeSize.height()) { \ - defaultSize = safeSize; \ - w.resize(defaultSize); \ - w.setAttribute(Qt::WA_Resized, false); \ - } \ - } while (false) -#else -# define SET_SAFE_SIZE(w) -#endif - - void tst_QWidget::setMinimumSize() { QWidget w; QSize defaultSize = w.size(); - SET_SAFE_SIZE(w); w.setMinimumSize(defaultSize + QSize(100, 100)); QCOMPARE(w.size(), defaultSize + QSize(100, 100)); @@ -3760,7 +3613,6 @@ void tst_QWidget::setMaximumSize() { QWidget w; QSize defaultSize = w.size(); - SET_SAFE_SIZE(w); w.setMinimumSize(defaultSize + QSize(100, 100)); QCOMPARE(w.size(), defaultSize + QSize(100, 100)); @@ -3780,7 +3632,6 @@ void tst_QWidget::setFixedSize() { QWidget w; QSize defaultSize = w.size(); - SET_SAFE_SIZE(w); w.setFixedSize(defaultSize + QSize(100, 100)); QCOMPARE(w.size(), defaultSize + QSize(100, 100)); @@ -4432,7 +4283,7 @@ Q_DECLARE_METATYPE(QList<QRect>) // Since X11 WindowManager operations are all async, and we have no way to know if the window // manager has finished playing with the window geometry, this test can't be reliable on X11. -#ifndef Q_WS_X11 + void tst_QWidget::setWindowGeometry_data() { QTest::addColumn<QList<QRect> >("rects"); @@ -4481,7 +4332,7 @@ void tst_QWidget::setWindowGeometry_data() .arg(rect.y()) .arg(rect.width()) .arg(rect.height()) - .arg(windowFlag, 0, 16).toAscii()) + .arg(windowFlag, 0, 16).toLatin1()) << l << windowFlag; } @@ -4490,6 +4341,9 @@ void tst_QWidget::setWindowGeometry_data() void tst_QWidget::setWindowGeometry() { + if (m_platform == QStringLiteral("xcb")) + QSKIP("X11: Skip this test due to Window manager positioning issues."); + QFETCH(QList<QRect>, rects); QFETCH(int, windowFlags); QRect rect = rects.takeFirst(); @@ -4610,9 +4464,8 @@ void tst_QWidget::setWindowGeometry() QTRY_COMPARE(widget.geometry(), rect); } } -#endif -#if defined (Q_WS_WIN) && !defined(Q_OS_WINCE) +#if defined (Q_OS_WIN) && !defined(Q_OS_WINCE) void tst_QWidget::setGeometry_win() { QWidget widget; @@ -4625,16 +4478,15 @@ void tst_QWidget::setGeometry_win() widget.setWindowState(widget.windowState() | Qt::WindowMaximized); widget.show(); RECT rt; - ::GetWindowRect(widget.internalWinId(), &rt); + ::GetWindowRect(winHandleOf(&widget), &rt); QVERIFY(rt.left <= 0); QVERIFY(rt.top <= 0); } -#endif +#endif // defined (Q_OS_WIN) && !defined(Q_OS_WINCE) // Since X11 WindowManager operation are all async, and we have no way to know if the window // manager has finished playing with the window geometry, this test can't be reliable on X11. -// 4DWM issues on IRIX also makes this test fail. -#if !defined(Q_WS_X11) && !defined(Q_OS_IRIX) + void tst_QWidget::windowMoveResize_data() { setWindowGeometry_data(); @@ -4642,6 +4494,9 @@ void tst_QWidget::windowMoveResize_data() void tst_QWidget::windowMoveResize() { + if (m_platform == QStringLiteral("xcb")) + QSKIP("X11: Skip this test due to Window manager positioning issues."); + QFETCH(QList<QRect>, rects); QFETCH(int, windowFlags); @@ -4684,9 +4539,9 @@ void tst_QWidget::windowMoveResize() QTRY_COMPARE(widget.size(), rect.size()); // move() while shown - foreach (QRect r, rects) { -#ifdef Q_WS_X11 - if ((widget.width() == 0 || widget.height() == 0) && r.width() != 0 && r.height() != 0) { + foreach (const QRect &r, rects) { + if (m_platform == QStringLiteral("xcb") + && ((widget.width() == 0 || widget.height() == 0) && r.width() != 0 && r.height() != 0)) { QEXPECT_FAIL("130,100 0x200, flags 0", "First resize after show of zero-sized gets wrong win_gravity.", Continue); @@ -4697,7 +4552,7 @@ void tst_QWidget::windowMoveResize() "First resize after show of zero-sized gets wrong win_gravity.", Continue); } -#endif + widget.move(r.topLeft()); widget.resize(r.size()); QApplication::processEvents(); @@ -4819,7 +4674,6 @@ void tst_QWidget::windowMoveResize() QTRY_COMPARE(widget.size(), rect.size()); } } -#endif class ColorWidget : public QWidget { @@ -4847,10 +4701,12 @@ public: #define VERIFY_COLOR(region, color) { \ const QRegion r = QRegion(region); \ + QScreen *screen = qApp->primaryScreen(); \ + const WId desktopWinId = QDesktopWidget().winId(); \ for (int i = 0; i < r.rects().size(); ++i) { \ const QRect rect = r.rects().at(i); \ for (int t = 0; t < 5; t++) { \ - const QPixmap pixmap = QPixmap::grabWindow(QDesktopWidget().winId(), \ + const QPixmap pixmap = screen->grabWindow(desktopWinId, \ rect.left(), rect.top(), \ rect.width(), rect.height()); \ QCOMPARE(pixmap.size(), rect.size()); \ @@ -5008,19 +4864,6 @@ void tst_QWidget::deleteStyle() qApp->processEvents(); } -#ifdef Q_WS_WIN -void tst_QWidget::getDC() -{ - QWidget widget; - widget.setGeometry(0, 0, 2, 4); - - HDC dc = widget.getDC(); - QVERIFY(dc != 0); - - widget.releaseDC(dc); -} -#endif - class TopLevelFocusCheck: public QWidget { Q_OBJECT @@ -5077,9 +4920,6 @@ void tst_QWidget::multipleToplevelFocusCheck() QApplication::processEvents(); QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&w2)); QTest::mouseClick(&w2, Qt::LeftButton); -#ifdef Q_WS_QWS - QEXPECT_FAIL("", "embedded toplevels take focus anyway", Continue); -#endif QTRY_COMPARE(QApplication::focusWidget(), (QWidget *)0); QTest::mouseDClick(&w2, Qt::LeftButton); @@ -5555,9 +5395,10 @@ void tst_QWidget::testWindowIconChangeEventPropagation() qApp->setWindowIcon(QIcon()); } -#ifdef Q_WS_X11 void tst_QWidget::minAndMaxSizeWithX11BypassWindowManagerHint() { + if (m_platform != QStringLiteral("xcb")) + QSKIP("This test is for X11 only."); // Same size as in QWidget::create_sys(). const QSize desktopSize = QApplication::desktop()->size(); const QSize originalSize(desktopSize.width() / 2, desktopSize.height() * 4 / 10); @@ -5570,7 +5411,7 @@ void tst_QWidget::minAndMaxSizeWithX11BypassWindowManagerHint() QCOMPARE(widget.size(), newMaximumSize); widget.show(); - qt_x11_wait_for_window_manager(&widget); + QTest::qWaitForWindowShown(widget.windowHandle()); QCOMPARE(widget.size(), newMaximumSize); } @@ -5582,7 +5423,7 @@ void tst_QWidget::minAndMaxSizeWithX11BypassWindowManagerHint() QCOMPARE(widget.size(), newMinimumSize); widget.show(); - qt_x11_wait_for_window_manager(&widget); + QTest::qWaitForWindowShown(widget.windowHandle()); QCOMPARE(widget.size(), newMinimumSize); } } @@ -5613,10 +5454,16 @@ public: } } - bool x11Event(XEvent *event) + bool nativeEvent(const QByteArray &eventType, void *message, long *) { - if (state == 1 && event->type == MapNotify) - gotExpectedMapNotify = true; + enum { XCB_MAP_NOTIFY = 19 }; + + if (state == 1 && eventType == QByteArrayLiteral("xcb_generic_event_t")) { + // XCB events have a uint8 response_type member at the beginning. + const unsigned char responseType = *(const unsigned char *)(message); + if ((responseType & ~0x80) == XCB_MAP_NOTIFY) + gotExpectedMapNotify = true; + } return false; } @@ -5624,8 +5471,11 @@ signals: void done(); }; -void tst_QWidget::showHideShow() +void tst_QWidget::showHideShowX11() { + if (m_platform != QStringLiteral("xcb")) + QSKIP("This test is for X11 only."); + ShowHideShowWidget w; w.show(); w.hide(); @@ -5639,6 +5489,9 @@ void tst_QWidget::showHideShow() void tst_QWidget::clean_qt_x11_enforce_cursor() { + if (m_platform != QStringLiteral("xcb")) + QSKIP("This test is for X11 only."); + { QWidget window; QWidget *w = new QWidget(&window); @@ -5665,7 +5518,6 @@ void tst_QWidget::clean_qt_x11_enforce_cursor() // If the test didn't crash, then it passed. } -#endif class EventRecorder : public QObject { @@ -5986,9 +5838,9 @@ void tst_QWidget::render() qApp->sendPostedEvents(); QTest::qWait(250); - QImage sourceImage = QPixmap::grabWidget(&source).toImage(); + const QImage sourceImage = source.grab(QRect(QPoint(0, 0), QSize(-1, -1))).toImage(); qApp->processEvents(); - QImage targetImage = QPixmap::grabWidget(&target).toImage(); + QImage targetImage = target.grab(QRect(QPoint(0, 0), QSize(-1, -1))).toImage(); qApp->processEvents(); QCOMPARE(sourceImage, targetImage); @@ -5999,7 +5851,7 @@ void tst_QWidget::render() qApp->processEvents(); qApp->sendPostedEvents(); - targetImage = QPixmap::grabWidget(&target).toImage(); + targetImage = target.grab(QRect(QPoint(0, 0), QSize(-1, -1))).toImage(); QVERIFY(sourceImage != targetImage); QCOMPARE(targetImage.pixel(target.width() / 2, 29), QColor(Qt::red).rgb()); @@ -6018,7 +5870,9 @@ void tst_QWidget::render() child.show(); qApp->processEvents(); - QCOMPARE(QPixmap::grabWidget(&child), QPixmap::grabWidget(&window)); + const QPixmap childPixmap = child.grab(QRect(QPoint(0, 0), QSize(-1, -1))); + const QPixmap windowPixmap = window.grab(QRect(QPoint(0, 0), QSize(-1, -1))); + QCOMPARE(childPixmap, windowPixmap); } { // Check that the target offset is correct. @@ -6056,7 +5910,7 @@ void tst_QWidget::render() // in testing the geometry so just workaround the palette issue for now. static void workaroundPaletteIssue(QWidget *widget) { -#ifndef Q_WS_WIN +#ifndef Q_OS_WIN return; #endif if (!widget) @@ -6381,7 +6235,8 @@ void tst_QWidget::render_task188133() // Make sure QWidget::render does not trigger QWidget::repaint/update // and asserts for Qt::WA_WState_Created. - QPixmap pixmap = QPixmap::grabWidget(&mainWindow); + const QPixmap pixmap = mainWindow.grab(QRect(QPoint(0, 0), QSize(-1, -1))); + Q_UNUSED(pixmap) } void tst_QWidget::render_task211796() @@ -6444,10 +6299,10 @@ void tst_QWidget::render_windowOpacity() child.setAutoFillBackground(true); QPixmap expected(child.size()); -#ifdef Q_WS_X11 - if (expected.depth() < 24) + + if (m_platform == QStringLiteral("xcb") && expected.depth() < 24) QSKIP("This test won't give correct results with dithered pixmaps"); -#endif + expected.fill(Qt::green); QPainter painter(&expected); painter.setOpacity(opacity); @@ -6908,8 +6763,6 @@ void tst_QWidget::setContentsMargins() QCOMPARE(newSize, label3.sizeHint()); } -// 4DWM issues on IRIX makes this test fail. -#ifndef Q_OS_IRIX void tst_QWidget::moveWindowInShowEvent_data() { QTest::addColumn<QPoint>("initial"); @@ -6947,18 +6800,15 @@ void tst_QWidget::moveWindowInShowEvent() // show it widget.show(); - #ifdef Q_WS_X11 - qt_x11_wait_for_window_manager(&widget); - #endif + QTest::qWaitForWindowShown(widget.windowHandle()); QTest::qWait(100); // it should have moved QCOMPARE(widget.pos(), position); } -#endif void tst_QWidget::repaintWhenChildDeleted() { -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN if (QSysInfo::WindowsVersion & QSysInfo::WV_VISTA) { QTest::qWait(1000); } @@ -7031,7 +6881,7 @@ void tst_QWidget::hideOpaqueChildWhileHidden() } // This test doesn't make sense without support for showMinimized(). -#if !defined(Q_OS_WINCE) && !defined(Q_WS_QWS) +#if !defined(Q_OS_WINCE) void tst_QWidget::updateWhileMinimized() { UpdateWidget widget; @@ -7064,7 +6914,6 @@ void tst_QWidget::updateWhileMinimized() } #endif -#if defined(Q_WS_WIN) || defined(Q_WS_X11) class PaintOnScreenWidget: public QWidget { public: @@ -7072,7 +6921,7 @@ public: :QWidget(parent, f) { } -#if defined(Q_WS_WIN) +#if defined(Q_OS_WIN) // This is the only way to enable PaintOnScreen on Windows. QPaintEngine * paintEngine () const {return 0;} #endif @@ -7080,6 +6929,9 @@ public: void tst_QWidget::alienWidgets() { + if (m_platform != QStringLiteral("xcb") && m_platform != QStringLiteral("windows")) + QSKIP("This test is only for X11/Windows."); + qApp->setAttribute(Qt::AA_DontCreateNativeWidgetSiblings); QWidget parent; QWidget child(&parent); @@ -7087,9 +6939,7 @@ void tst_QWidget::alienWidgets() QWidget greatGrandChild(&grandChild); parent.show(); -#ifdef Q_WS_X11 - qt_x11_wait_for_window_manager(&parent); -#endif + QTest::qWaitForWindowShown(parent.windowHandle()); // Verify that the WA_WState_Created attribute is set // and the top-level is the only native window. @@ -7160,36 +7010,20 @@ void tst_QWidget::alienWidgets() widget.show(); QVERIFY(widget.testAttribute(Qt::WA_WState_Created)); QVERIFY(!widget.internalWinId()); -#ifdef Q_WS_X11 - widget.handle(); -#else - widget.getDC(); -#endif - QVERIFY(widget.internalWinId()); - } -#ifdef Q_WS_X11 -#ifndef QT_NO_XRENDER - { // Enforce a native window when calling QWidget::x11PictureHandle(). - QWidget widget(&parent); - widget.show(); - QVERIFY(widget.testAttribute(Qt::WA_WState_Created)); - QVERIFY(!widget.internalWinId()); - widget.x11PictureHandle(); + widget.winId(); QVERIFY(widget.internalWinId()); } -#endif - { // Make sure we don't create native windows when setting Qt::WA_X11NetWmWindowType attributes - // on alien widgets (see task 194231). + if (m_platform == QStringLiteral("xcb")) { + // Make sure we don't create native windows when setting Qt::WA_X11NetWmWindowType attributes + // on alien widgets (see task 194231). QWidget dummy; QVERIFY(dummy.winId()); QWidget widget(&dummy); widget.setAttribute(Qt::WA_X11NetWmWindowTypeToolBar); QVERIFY(!widget.internalWinId()); } -#endif - { // Make sure we create native ancestors when setting Qt::WA_PaintOnScreen before show(). QWidget topLevel; @@ -7296,7 +7130,6 @@ void tst_QWidget::alienWidgets() QVERIFY(toolBar->testAttribute(Qt::WA_NativeWindow)); } } -#endif // Q_WS_WIN / Q_WS_X11 class ASWidget : public QWidget { @@ -7526,14 +7359,10 @@ void tst_QWidget::sendUpdateRequestImmediately() { UpdateWidget updateWidget; updateWidget.show(); -#ifdef Q_WS_X11 - qt_x11_wait_for_window_manager(&updateWidget); -#endif + + QTest::qWaitForWindowShown(updateWidget.windowHandle()); qApp->processEvents(); -#ifdef Q_WS_QWS - QApplication::sendPostedEvents(); //glib workaround -#endif updateWidget.reset(); QCOMPARE(updateWidget.numUpdateRequestEvents, 0); @@ -7541,8 +7370,6 @@ void tst_QWidget::sendUpdateRequestImmediately() QCOMPARE(updateWidget.numUpdateRequestEvents, 1); } -// 4DWM issues on IRIX makes this test fail. -#ifndef Q_OS_IRIX void tst_QWidget::doubleRepaint() { #if defined(Q_OS_MAC) @@ -7574,7 +7401,6 @@ void tst_QWidget::doubleRepaint() QTest::qWait(10); QCOMPARE(widget.numPaintEvents, 0); } -#endif void tst_QWidget::resizeInPaintEvent() { @@ -7616,9 +7442,7 @@ void tst_QWidget::opaqueChildren() greatGrandChild.setAutoFillBackground(true); // Opaque child widget. widget.show(); -#ifdef Q_WS_X11 - qt_x11_wait_for_window_manager(&widget); -#endif + QTest::qWaitForWindowShown(widget.windowHandle()); QTest::qWait(100); // Child, grandChild and greatGrandChild are outside the ancestor clip. @@ -7747,10 +7571,11 @@ void tst_QWidget::moveInResizeEvent() QTRY_COMPARE(testWidget.geometry(), expectedGeometry); } - -#if defined(Q_WS_WIN) || defined(Q_WS_X11) void tst_QWidget::immediateRepaintAfterShow() { + if (m_platform != QStringLiteral("xcb") && m_platform != QStringLiteral("windows")) + QSKIP("We don't support immediate repaint right after show on other platforms."); + UpdateWidget widget; widget.show(); qApp->processEvents(); @@ -7764,11 +7589,12 @@ void tst_QWidget::immediateRepaintAfterShow() void tst_QWidget::immediateRepaintAfterInvalidateBuffer() { + if (m_platform != QStringLiteral("xcb") && m_platform != QStringLiteral("windows")) + QSKIP("We don't support immediate repaint right after show on other platforms."); + QWidget *widget = new UpdateWidget; widget->show(); -#ifdef Q_WS_X11 - qt_x11_wait_for_window_manager(widget); -#endif + QTest::qWaitForWindowShown(widget->windowHandle()); QTest::qWait(200); static_cast<UpdateWidget *>(widget)->numPaintEvents = 0; @@ -7786,7 +7612,6 @@ void tst_QWidget::immediateRepaintAfterInvalidateBuffer() delete widget; } -#endif void tst_QWidget::effectiveWinId() { @@ -7941,31 +7766,43 @@ void tst_QWidget::moveRect() child.move(10, 10); // Don't crash. } -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN class GDIWidget : public QDialog { + Q_OBJECT public: GDIWidget() { setAttribute(Qt::WA_PaintOnScreen); } QPaintEngine *paintEngine() const { return 0; } void paintEvent(QPaintEvent *) { - HDC hdc = getDC(); + QPlatformNativeInterface *ni = QGuiApplication::platformNativeInterface(); + const HDC hdc = (HDC)ni->nativeResourceForWindow(QByteArrayLiteral("getDC"), windowHandle()); + if (!hdc) { + qWarning("%s: Unable to obtain native DC.", Q_FUNC_INFO); + QTimer::singleShot(0, this, SLOT(reject())); + return; + } SelectObject(hdc, CreateSolidBrush(RGB(255, 0, 0))); Rectangle(hdc, 0, 0, 10, 10); - releaseDC(hdc); - - QImage im = QPixmap::grabWindow(winId(), 0, 0, width(), height()).toImage(); - color = im.pixel(1, 1); + ni->nativeResourceForWindow(QByteArrayLiteral("releaseDC"), windowHandle()); - accept(); + QTimer::singleShot(0, this, SLOT(slotTimer())); } QSize sizeHint() const { return QSize(400, 300); } +private slots: + void slotTimer() { + const QImage im = grab(QRect(QPoint(0, 0), size())).toImage(); + color = im.pixel(1, 1); + accept(); + } + +public: QColor color; }; @@ -7988,7 +7825,7 @@ void tst_QWidget::paintOnScreenPossible() w2.setAttribute(Qt::WA_PaintOnScreen); QVERIFY(w2.testAttribute(Qt::WA_PaintOnScreen)); } -#endif +#endif // Q_OS_WIN void tst_QWidget::reparentStaticWidget() { @@ -8089,34 +7926,6 @@ void tst_QWidget::QTBUG6883_reparentStaticWidget2() //do not crash } -#ifdef Q_WS_QWS -void tst_QWidget::updateOutsideSurfaceClip() -{ - UpdateWidget widget; - widget.setWindowFlags(Qt::FramelessWindowHint); - widget.resize(100, 100); - widget.raise(); - widget.show(); - QTest::qWait(200); - widget.reset(); - - // Move widget partially outside buffer and change the surface clip. - widget.move(-50, 0); - QTest::qWait(100); - - // Update region is outside the surface clip and should not trigger a repaint. - widget.update(0, 0, 20, 20); - QTest::qWait(100); - QCOMPARE(widget.numPaintEvents, 0); - - // Now, move the widget back so that the update region is inside the clip - // and make sure we get a repaint of the dirty area. - widget.move(0, 0); - QTest::qWait(100); - QCOMPARE(widget.numPaintEvents, 1); - QCOMPARE(widget.paintedRegion, QRegion(0, 0, 20, 20)); -} -#endif class ColorRedWidget : public QWidget { public: @@ -8138,22 +7947,21 @@ void tst_QWidget::translucentWidget() ColorRedWidget label; label.setFixedSize(16,16); label.setAttribute(Qt::WA_TranslucentBackground); - label.move(qApp->desktop()->availableGeometry().topLeft()); + const QPoint labelPos = qApp->desktop()->availableGeometry().topLeft(); + label.move(labelPos); label.show(); -#ifdef Q_WS_X11 - qt_x11_wait_for_window_manager(&label); -#endif + QTest::qWaitForWindowShown(label.windowHandle()); QTest::qWait(200); QPixmap widgetSnapshot; -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN QWidget *desktopWidget = QApplication::desktop()->screen(0); if (QSysInfo::windowsVersion() >= QSysInfo::WV_VISTA) - widgetSnapshot = QPixmap::grabWindow(desktopWidget->winId(), 0,0, label.width(), label.height()); + widgetSnapshot = qApp->primaryScreen()->grabWindow(desktopWidget->winId(), labelPos.x(), labelPos.y(), label.width(), label.height()); else #endif - widgetSnapshot = QPixmap::grabWindow(label.winId()); + widgetSnapshot = label.grab(QRect(QPoint(0, 0), label.size())); QImage actual = widgetSnapshot.toImage().convertToFormat(QImage::Format_RGB32); QImage expected = pm.toImage().convertToFormat(QImage::Format_RGB32); QCOMPARE(actual.size(),expected.size()); @@ -8205,10 +8013,10 @@ void tst_QWidget::setClearAndResizeMask() const QRegion topLevelMask(0, 0, 100, 100, QRegion::Ellipse); topLevel.setMask(topLevelMask); QCOMPARE(topLevel.mask(), topLevelMask); -#if defined(Q_WS_WIN) || defined(Q_WS_X11) // We don't control what's happening on other platforms. - // and ensure that the top-level doesn't get any update. - QCOMPARE(topLevel.numPaintEvents, 0); -#endif + // Ensure that the top-level doesn't get any update. + // We don't control what's happening on platforms other than X11, Windows + if (m_platform == QStringLiteral("xcb") || m_platform == QStringLiteral("windows")) + QCOMPARE(topLevel.numPaintEvents, 0); topLevel.reset(); @@ -8218,11 +8026,12 @@ void tst_QWidget::setClearAndResizeMask() QTest::qWait(10); QRegion outsideOldMask(topLevel.rect()); outsideOldMask -= topLevelMask; -#if defined(Q_WS_WIN) || defined(Q_WS_X11) // We don't control what's happening on other platforms. - // and ensure that the top-level gets an update for the area outside the old mask. - QTRY_VERIFY(topLevel.numPaintEvents > 0); - QTRY_COMPARE(topLevel.paintedRegion, outsideOldMask); -#endif + // Ensure that the top-level gets an update for the area outside the old mask. + // We don't control what's happening on platforms other than X11, Windows + if (m_platform == QStringLiteral("xcb") || m_platform == QStringLiteral("windows")) { + QTRY_VERIFY(topLevel.numPaintEvents > 0); + QTRY_COMPARE(topLevel.paintedRegion, outsideOldMask); + } UpdateWidget child(&topLevel); child.setAutoFillBackground(true); // NB! Opaque child. @@ -8526,9 +8335,8 @@ void tst_QWidget::syntheticEnterLeave() window.show(); window.raise(); -#ifdef Q_WS_X11 - qt_x11_wait_for_window_manager(&window); -#endif + + QTest::qWaitForWindowShown(window.windowHandle()); QTest::qWait(300); #define RESET_EVENT_COUNTS \ @@ -8629,9 +8437,7 @@ void tst_QWidget::taskQTBUG_4055_sendSyntheticEnterLeave() SELChild child(&parent); child.resize(200, 200); parent.show(); - #ifdef Q_WS_X11 - qt_x11_wait_for_window_manager(&parent); - #endif + QTest::qWaitForWindowShown(parent.windowHandle()); QTest::qWait(150); QCursor::setPos(child.mapToGlobal(QPoint(100, 100))); @@ -8733,9 +8539,7 @@ void tst_QWidget::updateOnDestroyedSignal() child->setPalette(Qt::red); widget.show(); -#ifdef Q_WS_X11 - qt_x11_wait_for_window_manager(&widget); -#endif + QTest::qWaitForWindowShown(widget.windowHandle()); QTest::qWait(200); // Please do not crash. @@ -8788,9 +8592,7 @@ void tst_QWidget::destroyBackingStore() w.update(); QApplication::processEvents(); -#ifdef Q_WS_QWS - QApplication::processEvents(); -#endif + QCOMPARE(w.numPaintEvents, 1); // Check one more time, because the second time around does more caching. @@ -8798,7 +8600,7 @@ void tst_QWidget::destroyBackingStore() QApplication::processEvents(); QCOMPARE(w.numPaintEvents, 2); } -#endif +#endif // QT_BUILD_INTERNAL // Helper function QWidgetBackingStore* backingStore(QWidget &widget) @@ -8844,8 +8646,9 @@ void tst_QWidget::rectOutsideCoordinatesLimit_task144779() QPixmap correct(main.size()); correct.fill(Qt::green); + const QPixmap mainPixmap = main.grab(QRect(QPoint(0, 0), QSize(-1, -1))); - QTRY_COMPARE(QPixmap::grabWindow(main.winId()).toImage().convertToFormat(QImage::Format_RGB32), + QTRY_COMPARE(mainPixmap.toImage().convertToFormat(QImage::Format_RGB32), correct.toImage().convertToFormat(QImage::Format_RGB32)); QApplication::restoreOverrideCursor(); } @@ -9059,7 +8862,7 @@ void tst_QWidget::taskQTBUG_7532_tabOrderWithFocusProxy() void tst_QWidget::movedAndResizedAttributes() { -#if defined (Q_OS_MAC) || defined(Q_WS_QWS) +#if defined (Q_OS_MAC) QEXPECT_FAIL("", "FixMe, QTBUG-8941 and QTBUG-8977", Abort); QVERIFY(false); #else diff --git a/tests/auto/widgets/styles/qmacstyle/qmacstyle.pro b/tests/auto/widgets/styles/qmacstyle/qmacstyle.pro index 1408f87682..4cd85ab7f2 100644 --- a/tests/auto/widgets/styles/qmacstyle/qmacstyle.pro +++ b/tests/auto/widgets/styles/qmacstyle/qmacstyle.pro @@ -2,6 +2,3 @@ CONFIG += testcase TARGET = tst_qmacstyle QT += widgets testlib SOURCES += tst_qmacstyle.cpp - - -mac*:CONFIG+=insignificant_test diff --git a/tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp b/tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp index f732dfa18d..62e1c7c8ef 100644 --- a/tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp +++ b/tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp @@ -135,6 +135,7 @@ void tst_QMacStyle::sizeHints() QCOMPARE(sh(&progress1).width(), SIZE(16, 10, 10)); // Builder QRadioButton radio1("Radio", &w); + QEXPECT_FAIL("", "QTBUG-25296", Abort); QCOMPARE(sh(&radio1).height(), SIZE(15, 12, 10)); // Builder QCheckBox checkBox1("Switch", &w); @@ -401,6 +402,8 @@ void tst_QMacStyle::smallMiniNormalExclusivity() opt.initFrom(&dummyWidget); QSize size = dummyWidget.style()->sizeFromContents(QStyle::CT_PushButton, &opt, QSize(0, 0), &dummyWidget); + if (size.height() != expected[i]) + QEXPECT_FAIL("", "QTBUG-25296", Abort); QCOMPARE(size.height(), expected[i]); } } diff --git a/tests/auto/widgets/util/qcompleter/qcompleter.pro b/tests/auto/widgets/util/qcompleter/qcompleter.pro index 6a817a89ac..19d8d500b8 100644 --- a/tests/auto/widgets/util/qcompleter/qcompleter.pro +++ b/tests/auto/widgets/util/qcompleter/qcompleter.pro @@ -4,5 +4,3 @@ TARGET = tst_qcompleter QT += widgets testlib SOURCES += tst_qcompleter.cpp - -CONFIG += insignificant_test # QTBUG-21424 diff --git a/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp b/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp index a257eb1798..61b0e04624 100644 --- a/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp +++ b/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp @@ -266,7 +266,7 @@ retry: for (int i = 0; i < step.length(); i++) { int row = completer->currentRow(); - switch (step[i].toUpper().toAscii()) { + switch (step[i].toUpper().toLatin1()) { case 'P': --row; break; case 'N': ++row; break; case 'L': row = completer->completionCount() - 1; break; diff --git a/tests/auto/widgets/widgets/qcombobox/qcombobox.pro b/tests/auto/widgets/widgets/qcombobox/qcombobox.pro index e0545630c5..88b9d08557 100644 --- a/tests/auto/widgets/widgets/qcombobox/qcombobox.pro +++ b/tests/auto/widgets/widgets/qcombobox/qcombobox.pro @@ -2,5 +2,3 @@ CONFIG += testcase TARGET = tst_qcombobox QT += widgets widgets-private gui-private core-private testlib SOURCES += tst_qcombobox.cpp - -linux-*:system(". /etc/lsb-release && [ $DISTRIB_CODENAME = oneiric ]"):CONFIG += insignificant_test # QTBUG-23639, (related QTBUG-1071) diff --git a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp index 4730d7d556..90b5a88805 100644 --- a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp +++ b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp @@ -1271,7 +1271,7 @@ void tst_QComboBox::insertOnCurrentIndex() testWidget->addItem("first item"); testWidget->setCurrentIndex(0); testWidget->insertItem(0, "second item"); - QCOMPARE(testWidget->lineEdit()->text(), QString::fromAscii("first item")); + QCOMPARE(testWidget->lineEdit()->text(), QString::fromLatin1("first item")); } void tst_QComboBox::textpixmapdata_data() @@ -1669,33 +1669,33 @@ void tst_QComboBox::flaggedItems_data() KeyList keyMovementList; keyMovementList << Qt::Key_Down << Qt::Key_Down << Qt::Key_Down << Qt::Key_Down; - QTest::newRow(testCase.toAscii() + "normal") << itemList << deselectFlagList << disableFlagList << keyMovementList << bool(editable) << 4; + QTest::newRow(testCase.toLatin1() + "normal") << itemList << deselectFlagList << disableFlagList << keyMovementList << bool(editable) << 4; deselectFlagList.clear(); disableFlagList.clear(); deselectFlagList << 1 << 3; - QTest::newRow(testCase.toAscii() + "non-selectable") << itemList << deselectFlagList << disableFlagList << keyMovementList << bool(editable) << 4; + QTest::newRow(testCase.toLatin1() + "non-selectable") << itemList << deselectFlagList << disableFlagList << keyMovementList << bool(editable) << 4; deselectFlagList.clear(); disableFlagList.clear(); disableFlagList << 2; - QTest::newRow(testCase.toAscii() + "disabled") << itemList << deselectFlagList << disableFlagList << keyMovementList << bool(editable) << 5; + QTest::newRow(testCase.toLatin1() + "disabled") << itemList << deselectFlagList << disableFlagList << keyMovementList << bool(editable) << 5; deselectFlagList.clear(); disableFlagList.clear(); deselectFlagList << 1 << 3; disableFlagList << 2 << 3; - QTest::newRow(testCase.toAscii() + "mixed") << itemList << deselectFlagList << disableFlagList << keyMovementList << bool(editable) << 6; + QTest::newRow(testCase.toLatin1() + "mixed") << itemList << deselectFlagList << disableFlagList << keyMovementList << bool(editable) << 6; deselectFlagList.clear(); disableFlagList.clear(); disableFlagList << 0 << 1 << 2 << 3 << 4 << 5 << 6; - QTest::newRow(testCase.toAscii() + "nearly-empty") << itemList << deselectFlagList << disableFlagList << keyMovementList << bool(editable) << 7; + QTest::newRow(testCase.toLatin1() + "nearly-empty") << itemList << deselectFlagList << disableFlagList << keyMovementList << bool(editable) << 7; deselectFlagList.clear(); disableFlagList.clear(); disableFlagList << 0 << 1 << 2 << 3 << 5 << 6 << 7; keyMovementList.clear(); - QTest::newRow(testCase.toAscii() + "only one enabled") << itemList << deselectFlagList << disableFlagList << keyMovementList << bool(editable) << 4; + QTest::newRow(testCase.toLatin1() + "only one enabled") << itemList << deselectFlagList << disableFlagList << keyMovementList << bool(editable) << 4; if (!editable) { deselectFlagList.clear(); @@ -1703,38 +1703,38 @@ void tst_QComboBox::flaggedItems_data() keyMovementList.clear(); disableFlagList << 0 << 2 << 3; keyMovementList << Qt::Key_Down << Qt::Key_Home; - QTest::newRow(testCase.toAscii() + "home-disabled") << itemList << deselectFlagList << disableFlagList << keyMovementList << bool(editable) << 1; + QTest::newRow(testCase.toLatin1() + "home-disabled") << itemList << deselectFlagList << disableFlagList << keyMovementList << bool(editable) << 1; keyMovementList.clear(); keyMovementList << Qt::Key_End; - QTest::newRow(testCase.toAscii() + "end-key") << itemList << deselectFlagList << disableFlagList << keyMovementList << bool(editable) << 7; + QTest::newRow(testCase.toLatin1() + "end-key") << itemList << deselectFlagList << disableFlagList << keyMovementList << bool(editable) << 7; disableFlagList.clear(); disableFlagList << 1 ; keyMovementList << Qt::Key_T; - QTest::newRow(testCase.toAscii() + "keyboard-search") << itemList << deselectFlagList << disableFlagList << keyMovementList << bool(editable) << 2; + QTest::newRow(testCase.toLatin1() + "keyboard-search") << itemList << deselectFlagList << disableFlagList << keyMovementList << bool(editable) << 2; itemList << "nine" << "ten"; keyMovementList << Qt::Key_T; - QTest::newRow(testCase.toAscii() + "search same start letter") << itemList << deselectFlagList << disableFlagList << keyMovementList << bool(editable) << 9; + QTest::newRow(testCase.toLatin1() + "search same start letter") << itemList << deselectFlagList << disableFlagList << keyMovementList << bool(editable) << 9; keyMovementList.clear(); keyMovementList << Qt::Key_T << Qt::Key_H; - QTest::newRow(testCase.toAscii() + "keyboard search item") << itemList << deselectFlagList << disableFlagList << keyMovementList << bool(editable) << 2; + QTest::newRow(testCase.toLatin1() + "keyboard search item") << itemList << deselectFlagList << disableFlagList << keyMovementList << bool(editable) << 2; disableFlagList.clear(); disableFlagList << 1 << 3 << 5 << 7 << 9; keyMovementList.clear(); keyMovementList << Qt::Key_End << Qt::Key_Up << Qt::Key_Up << Qt::Key_PageDown << Qt::Key_PageUp << Qt::Key_PageUp << Qt::Key_Down; - QTest::newRow(testCase.toAscii() + "all key combinations") << itemList << deselectFlagList << disableFlagList << keyMovementList << bool(editable) << 4; + QTest::newRow(testCase.toLatin1() + "all key combinations") << itemList << deselectFlagList << disableFlagList << keyMovementList << bool(editable) << 4; } else { deselectFlagList.clear(); disableFlagList.clear(); disableFlagList << 1; keyMovementList.clear(); keyMovementList << Qt::Key_T << Qt::Key_Enter; - QTest::newRow(testCase.toAscii() + "disabled") << itemList << deselectFlagList << disableFlagList << keyMovementList << bool(editable) << 2; - QTest::newRow(testCase.toAscii() + "broken autocompletion") << itemList << deselectFlagList << disableFlagList << keyMovementList << bool(editable) << 2; + QTest::newRow(testCase.toLatin1() + "disabled") << itemList << deselectFlagList << disableFlagList << keyMovementList << bool(editable) << 2; + QTest::newRow(testCase.toLatin1() + "broken autocompletion") << itemList << deselectFlagList << disableFlagList << keyMovementList << bool(editable) << 2; } } } diff --git a/tests/auto/widgets/widgets/qdatetimeedit/qdatetimeedit.pro b/tests/auto/widgets/widgets/qdatetimeedit/qdatetimeedit.pro index 41c90b499a..2362be3b73 100644 --- a/tests/auto/widgets/widgets/qdatetimeedit/qdatetimeedit.pro +++ b/tests/auto/widgets/widgets/qdatetimeedit/qdatetimeedit.pro @@ -4,4 +4,3 @@ QT += widgets testlib SOURCES += tst_qdatetimeedit.cpp wincewm50smart-msvc2005: DEFINES += WINCE_NO_MODIFIER_KEYS -mac:CONFIG += insignificant_test # numerous failures, see QTBUG-23674 diff --git a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp index e66909e9eb..a6f344c4bc 100644 --- a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp +++ b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp @@ -786,6 +786,9 @@ void tst_QDateTimeEdit::selectAndScrollWithKeys() QTest::keyClick(testWidget, Qt::Key_Home); #endif QTest::keyClick(testWidget, Qt::Key_Right, Qt::ShiftModifier); +#ifdef Q_OS_MAC + QEXPECT_FAIL("", "QTBUG-23674", Abort); +#endif QCOMPARE(testWidget->lineEdit()->selectedText(), QString("1")); QTest::keyClick(testWidget, Qt::Key_Right, Qt::ShiftModifier); QCOMPARE(testWidget->lineEdit()->selectedText(), QString("11")); @@ -889,6 +892,9 @@ void tst_QDateTimeEdit::backspaceKey() #endif QCOMPARE(testWidget->text(), QString("11/05/2004")); QTest::keyClick(testWidget, Qt::Key_Backspace); +#ifdef Q_OS_MAC + QEXPECT_FAIL("", "QTBUG-23674", Abort); +#endif QCOMPARE(testWidget->text(), QString("11/05/200")); QTest::keyClick(testWidget, Qt::Key_Backspace); QCOMPARE(testWidget->text(), QString("11/05/20")); @@ -1025,6 +1031,9 @@ void tst_QDateTimeEdit::enterKey() QTest::keyClick(testWidget, Qt::Key_Home); #endif QTest::keyClick(testWidget, Qt::Key_Enter); +#ifdef Q_OS_MAC + QEXPECT_FAIL("", "QTBUG-23674", Abort); +#endif QVERIFY(!testWidget->lineEdit()->hasSelectedText()); #ifdef Q_OS_MAC QTest::keyClick(testWidget, Qt::Key_Right, Qt::ControlModifier); @@ -2040,7 +2049,7 @@ void tst_QDateTimeEdit::dateSignalChecking() if (timesEmitted > 0) { QList<QVariant> list = dateSpy.takeFirst(); QDate d; - d = qVariantValue<QDate>(list.at(0)); + d = qvariant_cast<QDate>(list.at(0)); QCOMPARE(d, newDate); } QCOMPARE(dateTimeSpy.count(), timesEmitted); @@ -2076,7 +2085,7 @@ void tst_QDateTimeEdit::timeSignalChecking() if (timesEmitted > 0) { QList<QVariant> list = timeSpy.takeFirst(); QTime t; - t = qVariantValue<QTime>(list.at(0)); + t = qvariant_cast<QTime>(list.at(0)); QCOMPARE(t, newTime); } QCOMPARE(dateTimeSpy.count(), timesEmitted); @@ -2126,21 +2135,21 @@ void tst_QDateTimeEdit::dateTimeSignalChecking() QCOMPARE(timesDateEmitted, 1); QList<QVariant> list = dateSpy.takeFirst(); QDate d; - d = qVariantValue<QDate>(list.at(0)); + d = qvariant_cast<QDate>(list.at(0)); QCOMPARE(d, newDateTime.date()); } QCOMPARE(timeSpy.count(), timesTimeEmitted); if (timesTimeEmitted > 0) { QList<QVariant> list = timeSpy.takeFirst(); QTime t; - t = qVariantValue<QTime>(list.at(0)); + t = qvariant_cast<QTime>(list.at(0)); QCOMPARE(t, newDateTime.time()); } QCOMPARE(dateTimeSpy.count(), timesDateTimeEmitted); if (timesDateTimeEmitted > 0) { QList<QVariant> list = dateTimeSpy.takeFirst(); QDateTime dt; - dt = qVariantValue<QDateTime>(list.at(0)); + dt = qvariant_cast<QDateTime>(list.at(0)); QCOMPARE(dt, newDateTime); } } @@ -2551,6 +2560,9 @@ void tst_QDateTimeEdit::newCase() #else QTest::keyClick(testWidget, Qt::Key_Home); #endif +#ifdef Q_OS_MAC + QEXPECT_FAIL("", "QTBUG-23674", Abort); +#endif QCOMPARE(testWidget->lineEdit()->selectedText(), QString()); QTest::keyClick(testWidget, Qt::Key_Right); QTest::keyClick(testWidget, Qt::Key_Right); @@ -2627,6 +2639,9 @@ void tst_QDateTimeEdit::cursorPos() QTest::keyClick(testWidget, Qt::Key_Return); QTest::keyClick(testWidget, Qt::Key_3); QTest::keyClick(testWidget, Qt::Key_1); +#ifdef Q_OS_MAC + QEXPECT_FAIL("", "QTBUG-23674", Abort); +#endif QCOMPARE(testWidget->lineEdit()->cursorPosition(), 3); } @@ -2660,6 +2675,9 @@ void tst_QDateTimeEdit::newCase5() QTest::keyClick(testWidget, Qt::Key_1); QTest::keyClick(testWidget, Qt::Key_2); QTest::keyClick(testWidget, Qt::Key_4); +#ifdef Q_OS_MAC + QEXPECT_FAIL("", "QTBUG-23674", Abort); +#endif QCOMPARE(testWidget->lineEdit()->displayText(), QString("2005-10-07 17:44:13 124 ms")); QTest::keyClick(testWidget, Qt::Key_Backspace); @@ -2770,6 +2788,9 @@ void tst_QDateTimeEdit::setSelectedSection() #else QTest::keyClick(testWidget, Qt::Key_Home); #endif +#ifdef Q_OS_MAC + QEXPECT_FAIL("", "QTBUG-23674", Abort); +#endif QVERIFY(!testWidget->lineEdit()->hasSelectedText()); testWidget->setSelectedSection(QDateTimeEdit::MinuteSection); QCOMPARE(testWidget->lineEdit()->selectedText(), QString("00")); @@ -2887,6 +2908,9 @@ void tst_QDateTimeEdit::reverseTest() #else QTest::keyClick(testWidget, Qt::Key_End); #endif +#ifdef Q_OS_MAC + QEXPECT_FAIL("", "QTBUG-23674", Abort); +#endif QCOMPARE(testWidget->currentSection(), QDateTimeEdit::DaySection); QTest::keyClick(testWidget, Qt::Key_Up); QCOMPARE(testWidget->date(), QDate(2001, 3, 31)); @@ -3039,6 +3063,9 @@ void tst_QDateTimeEdit::ddMMMMyyyy() QTest::keyClick(testWidget, Qt::Key_End); #endif QTest::keyClick(testWidget, Qt::Key_Backspace); +#ifdef Q_OS_MAC + QEXPECT_FAIL("", "QTBUG-23674", Abort); +#endif QCOMPARE(testWidget->lineEdit()->text(), "01." + QDate::longMonthName(1) + ".200"); } @@ -3328,6 +3355,9 @@ void tst_QDateTimeEdit::potentialYYValueBug() QTest::keyClick(&edit, Qt::Key_End); #endif QTest::keyClick(&edit, Qt::Key_Backspace); +#ifdef Q_OS_MAC + QEXPECT_FAIL("", "QTBUG-23674", Abort); +#endif QCOMPARE(edit.text(), QString("14/09/5")); } @@ -3343,6 +3373,9 @@ void tst_QDateTimeEdit::textSectionAtEnd() QTest::keyClick(&edit, Qt::Key_End); #endif QTest::keyClick(&edit, Qt::Key_Backspace); +#ifdef Q_OS_MAC + QEXPECT_FAIL("", "QTBUG-23674", Abort); +#endif QCOMPARE(edit.text(), QString("Januar")); } diff --git a/tests/auto/widgets/widgets/qdoublespinbox/qdoublespinbox.pro b/tests/auto/widgets/widgets/qdoublespinbox/qdoublespinbox.pro index 183210b597..cc66eaae26 100644 --- a/tests/auto/widgets/widgets/qdoublespinbox/qdoublespinbox.pro +++ b/tests/auto/widgets/widgets/qdoublespinbox/qdoublespinbox.pro @@ -2,5 +2,3 @@ CONFIG += testcase TARGET = tst_qdoublespinbox QT += widgets testlib SOURCES += tst_qdoublespinbox.cpp - -linux-*:system(". /etc/lsb-release && [ $DISTRIB_CODENAME = oneiric ]"):CONFIG += insignificant_test # QTBUG-23641 diff --git a/tests/auto/widgets/widgets/qmdiarea/qmdiarea.pro b/tests/auto/widgets/widgets/qmdiarea/qmdiarea.pro index 54aa3c4ff1..d2156a1718 100644 --- a/tests/auto/widgets/widgets/qmdiarea/qmdiarea.pro +++ b/tests/auto/widgets/widgets/qmdiarea/qmdiarea.pro @@ -12,4 +12,4 @@ mac { LIBS += -framework Security } -CONFIG+=insignificant_test +!mac:!win32:CONFIG+=insignificant_test # QTBUG-25298 diff --git a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp index eeb2eea9a1..7aa9bb2ddf 100644 --- a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp +++ b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp @@ -530,6 +530,9 @@ void tst_QMdiArea::subWindowActivated2() #ifdef Q_OS_WINCE QSKIP("Not fixed yet. See Task 197453"); #endif +#ifdef Q_OS_MAC + QSKIP("QTBUG-25298: This test is unstable on Mac."); +#endif QTRY_COMPARE(spy.count(), 1); QVERIFY(!mdiArea.activeSubWindow()); QCOMPARE(mdiArea.currentSubWindow(), activeSubWindow); @@ -1029,7 +1032,7 @@ void tst_QMdiArea::activeSubWindow() qApp->setActiveWindow(&mainWindow); QCOMPARE(mdiArea->activeSubWindow(), subWindow); -#if !defined(Q_OS_MAC) && !defined(Q_WS_WIN) +#if !defined(Q_OS_MAC) && !defined(Q_OS_WIN) qApp->setActiveWindow(0); QVERIFY(!mdiArea->activeSubWindow()); #endif @@ -1114,7 +1117,7 @@ void tst_QMdiArea::currentSubWindow() QVERIFY(mdiArea.activeSubWindow()); QVERIFY(mdiArea.currentSubWindow()); -#if !defined(Q_OS_MAC) && !defined(Q_WS_WIN) +#if !defined(Q_OS_MAC) && !defined(Q_OS_WIN) qApp->setActiveWindow(0); QVERIFY(!mdiArea.activeSubWindow()); QVERIFY(mdiArea.currentSubWindow()); @@ -1756,6 +1759,9 @@ void tst_QMdiArea::tileSubWindows() #ifdef Q_OS_WINCE QSKIP("Not fixed yet! See task 197453"); #endif +#ifdef Q_OS_MAC + QEXPECT_FAIL("", "QTBUG-25298", Abort); +#endif QTRY_COMPARE(workspace.viewport()->rect().size(), expectedViewportSize); // Not enough space for all sub-windows to be visible -> provide scroll bars. @@ -1825,6 +1831,9 @@ void tst_QMdiArea::cascadeAndTileSubWindows() titleBarHeight -= 4; const QFontMetrics fontMetrics = QFontMetrics(QApplication::font("QMdiSubWindowTitleBar")); const int dy = qMax(titleBarHeight - (titleBarHeight - fontMetrics.height()) / 2, 1); +#ifdef Q_OS_MAC + QEXPECT_FAIL("", "QTBUG-25298", Abort); +#endif QCOMPARE(windows.at(2)->geometry().top() - windows.at(1)->geometry().top(), dy); for (int i = 0; i < windows.count(); ++i) { @@ -2286,6 +2295,9 @@ void tst_QMdiArea::setActivationOrder() QVERIFY(verifyArrangement(&mdiArea, Tiled, expectedTileIndices)); mdiArea.cascadeSubWindows(); +#ifdef Q_OS_MAC + QEXPECT_FAIL("", "QTBUG-25298", Abort); +#endif QVERIFY(verifyArrangement(&mdiArea, Cascaded, expectedCascadeIndices)); QTest::qWait(100); @@ -2333,6 +2345,9 @@ void tst_QMdiArea::tabBetweenSubWindows() QCOMPARE(spy.count(), 0); // Walk through the entire list of sub windows. +#ifdef Q_OS_MAC + QEXPECT_FAIL("", "QTBUG-25298", Abort); +#endif QVERIFY(tabBetweenSubWindowsIn(&mdiArea)); QCOMPARE(mdiArea.activeSubWindow(), subWindows.back()); QCOMPARE(spy.count(), 0); diff --git a/tests/auto/widgets/widgets/qmdisubwindow/qmdisubwindow.pro b/tests/auto/widgets/widgets/qmdisubwindow/qmdisubwindow.pro index be929d1429..4299f7711e 100644 --- a/tests/auto/widgets/widgets/qmdisubwindow/qmdisubwindow.pro +++ b/tests/auto/widgets/widgets/qmdisubwindow/qmdisubwindow.pro @@ -4,6 +4,3 @@ QT += widgets testlib INCLUDEPATH += . SOURCES += tst_qmdisubwindow.cpp DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII - - -mac*:CONFIG+=insignificant_test diff --git a/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp b/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp index bc5100f118..79afd14481 100644 --- a/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp +++ b/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp @@ -610,6 +610,9 @@ void tst_QMdiSubWindow::showShaded() else #endif mouseReceiver = window; +#ifdef Q_OS_MAC + QEXPECT_FAIL("", "QTBUG-25297", Abort); +#endif QVERIFY(mouseReceiver); sendMouseMove(mouseReceiver, mousePosition, Qt::NoButton); sendMousePress(mouseReceiver, mousePosition); @@ -724,6 +727,9 @@ void tst_QMdiSubWindow::setOpaqueResizeAndMove() mouseReceiver = qFindChild<QSizeGrip *>(window); else mouseReceiver = window; +#ifdef Q_OS_MAC + QEXPECT_FAIL("", "QTBUG-25297", Abort); +#endif QVERIFY(mouseReceiver); // ----------------------------- resize ----------------------------- @@ -1432,6 +1438,9 @@ void tst_QMdiSubWindow::defaultSizeGrip() // QSizeGrip on windows with decoration. QMdiSubWindow *windowWithDecoration = mdiArea.addSubWindow(new QWidget); windowWithDecoration->show(); +#ifdef Q_OS_MAC + QEXPECT_FAIL("", "QTBUG-25297", Abort); +#endif QVERIFY(qFindChild<QSizeGrip *>(windowWithDecoration)); // ...but not on windows without decoration (Qt::FramelessWindowHint). @@ -1699,6 +1708,9 @@ void tst_QMdiSubWindow::fixedMinMaxSize() // to minimize the window. subWindow->showMinimized(); QVERIFY(subWindow->isMinimized()); +#ifdef Q_OS_MAC + QEXPECT_FAIL("", "QTBUG-25297", Abort); +#endif QCOMPARE(subWindow->size(), minimizedSize); QCOMPARE(subWindow->minimumSize(), minimizedSize); diff --git a/tests/auto/widgets/widgets/qmenubar/qmenubar.pro b/tests/auto/widgets/widgets/qmenubar/qmenubar.pro index c74c9e84c1..3fb6ae61a8 100644 --- a/tests/auto/widgets/widgets/qmenubar/qmenubar.pro +++ b/tests/auto/widgets/widgets/qmenubar/qmenubar.pro @@ -2,5 +2,3 @@ CONFIG += testcase TARGET = tst_qmenubar QT += widgets testlib SOURCES += tst_qmenubar.cpp - -linux-*:system(". /etc/lsb-release && [ $DISTRIB_CODENAME = oneiric ]"):CONFIG += insignificant_test # QTBUG-4965, QTBUG-11823 diff --git a/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp b/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp index 6a1f418739..6f7d7517e8 100644 --- a/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp +++ b/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp @@ -980,7 +980,7 @@ void tst_QMenuBar::check_altPress() { if ( !qApp->style()->styleHint(QStyle::SH_MenuBar_AltKeyNavigation) ) { QSKIP( QString( "this is not supposed to work in the %1 style. Skipping." ). - arg( qApp->style()->objectName() ).toAscii()); + arg( qApp->style()->objectName() ).toLatin1()); } initSimpleMenubar(); diff --git a/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp b/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp index 4019faf428..1052bb2103 100644 --- a/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp +++ b/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp @@ -345,7 +345,7 @@ void tst_QPlainTextEdit::selectAllSetsNotSelection() ed->insertPlainText("Hello World"); ed->selectAll(); - QCOMPARE(QApplication::clipboard()->text(QClipboard::Selection), QString::fromAscii("foobar")); + QCOMPARE(QApplication::clipboard()->text(QClipboard::Selection), QString::fromLatin1("foobar")); } #endif diff --git a/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp b/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp index 1c06197d11..7696ab2dea 100644 --- a/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp +++ b/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp @@ -561,37 +561,37 @@ void tst_QPushButton::sizeHint_data() { QTest::addColumn<QString>("stylename"); #if !defined(QT_NO_STYLE_MOTIF) - QTest::newRow("motif") << QString::fromAscii("motif"); + QTest::newRow("motif") << QString::fromLatin1("motif"); #endif #if !defined(QT_NO_STYLE_CDE) - QTest::newRow("cde") << QString::fromAscii("cde"); + QTest::newRow("cde") << QString::fromLatin1("cde"); #endif #if !defined(QT_NO_STYLE_WINDOWS) - QTest::newRow("windows") << QString::fromAscii("windows"); + QTest::newRow("windows") << QString::fromLatin1("windows"); #endif #if !defined(QT_NO_STYLE_CLEANLOOKS) - QTest::newRow("cleanlooks") << QString::fromAscii("cleanlooks"); + QTest::newRow("cleanlooks") << QString::fromLatin1("cleanlooks"); #endif #if !defined(QT_NO_STYLE_GTK) - QTest::newRow("gtk") << QString::fromAscii("gtk"); + QTest::newRow("gtk") << QString::fromLatin1("gtk"); #endif #if defined(Q_OS_MAC) && !defined(QT_NO_STYLE_MAC) - QTest::newRow("mac") << QString::fromAscii("mac"); + QTest::newRow("mac") << QString::fromLatin1("mac"); #endif #if !defined(QT_NO_STYLE_PLASTIQUE) - QTest::newRow("plastique") << QString::fromAscii("plastique"); + QTest::newRow("plastique") << QString::fromLatin1("plastique"); #endif #if defined(Q_OS_WIN) && !defined(QT_NO_STYLE_WINDOWSXP) - QTest::newRow("windowsxp") << QString::fromAscii("windowsxp"); + QTest::newRow("windowsxp") << QString::fromLatin1("windowsxp"); #endif #if defined(Q_OS_WIN) && !defined(QT_NO_STYLE_WINDOWSVISTA) - QTest::newRow("windowsvista") << QString::fromAscii("windowsvista"); + QTest::newRow("windowsvista") << QString::fromLatin1("windowsvista"); #endif #if defined(Q_OS_WINCE) && !defined(QT_NO_STYLE_WINDOWSCE) - QTest::newRow("windowsce") << QString::fromAscii("windowsce"); + QTest::newRow("windowsce") << QString::fromLatin1("windowsce"); #endif #if defined(Q_OS_WINCE_WM) && !defined(QT_NO_STYLE_WINDOWSCE) - QTest::newRow("windowsmobile") << QString::fromAscii("windowsmobile"); + QTest::newRow("windowsmobile") << QString::fromLatin1("windowsmobile"); #endif } diff --git a/tests/auto/widgets/widgets/qsizegrip/qsizegrip.pro b/tests/auto/widgets/widgets/qsizegrip/qsizegrip.pro index 98cf169730..1149b50feb 100644 --- a/tests/auto/widgets/widgets/qsizegrip/qsizegrip.pro +++ b/tests/auto/widgets/widgets/qsizegrip/qsizegrip.pro @@ -3,5 +3,3 @@ TARGET = tst_qsizegrip INCLUDEPATH += . QT += widgets testlib SOURCES += tst_qsizegrip.cpp - -mac: CONFIG += insignificant_test # failures on mac, QTBUG-23681 diff --git a/tests/auto/widgets/widgets/qsizegrip/tst_qsizegrip.cpp b/tests/auto/widgets/widgets/qsizegrip/tst_qsizegrip.cpp index 4c5df04188..a0a314bd9d 100644 --- a/tests/auto/widgets/widgets/qsizegrip/tst_qsizegrip.cpp +++ b/tests/auto/widgets/widgets/qsizegrip/tst_qsizegrip.cpp @@ -140,6 +140,7 @@ void tst_QSizeGrip::hideAndShowOnWindowStateChange() #ifndef Q_OS_MAC QVERIFY(!sizeGrip->isVisible()); #else + QEXPECT_FAIL("", "QTBUG-23681", Abort); QVERIFY(sizeGrip->isVisible()); #endif diff --git a/tests/auto/widgets/widgets/qstatusbar/tst_qstatusbar.cpp b/tests/auto/widgets/widgets/qstatusbar/tst_qstatusbar.cpp index 081e817727..d23f69ac6c 100644 --- a/tests/auto/widgets/widgets/qstatusbar/tst_qstatusbar.cpp +++ b/tests/auto/widgets/widgets/qstatusbar/tst_qstatusbar.cpp @@ -199,7 +199,9 @@ void tst_QStatusBar::setSizeGripEnabled() QVERIFY(!sizeGrip); qApp->processEvents(); +#ifndef Q_OS_MAC // Work around Lion fullscreen issues on CI system - QTQAINFRA-506 mainWindow.showFullScreen(); +#endif #ifdef Q_WS_X11 qt_x11_wait_for_window_manager(&mainWindow); #endif @@ -220,7 +222,9 @@ void tst_QStatusBar::setSizeGripEnabled() QVERIFY(!sizeGrip->isVisible()); qApp->processEvents(); +#ifndef Q_OS_MAC mainWindow.showNormal(); +#endif qApp->processEvents(); QTRY_VERIFY(sizeGrip->isVisible()); } diff --git a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp index a3f58c4c0d..88489f4328 100644 --- a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp +++ b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp @@ -604,7 +604,7 @@ void tst_QTextEdit::selectAllSetsNotSelection() ed->insertPlainText("Hello World"); ed->selectAll(); - QCOMPARE(QApplication::clipboard()->text(QClipboard::Selection), QString::fromAscii("foobar")); + QCOMPARE(QApplication::clipboard()->text(QClipboard::Selection), QString::fromLatin1("foobar")); } #endif void tst_QTextEdit::asciiTab() |