diff options
Diffstat (limited to 'tests/auto/widgets')
12 files changed, 24 insertions, 37 deletions
diff --git a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp index 0e19e88793..574041cd44 100644 --- a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp +++ b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp @@ -388,9 +388,6 @@ void tst_QDialog::toolDialogPosition() #if defined(Q_OS_WINCE) QSKIP("No real support for Qt::Tool on WinCE"); #endif -#ifdef Q_OS_WIN - QSKIP("QTBUG-25331 - positioning failure"); -#endif QDialog dialog(0, Qt::Tool); dialog.move(QPoint(100,100)); const QPoint beforeShowPosition = dialog.pos(); diff --git a/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp b/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp index 1d391a1c09..6c91bb7a35 100644 --- a/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp +++ b/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp @@ -48,7 +48,7 @@ #include <QApplication> #include <QPushButton> #include <QDialogButtonBox> -#include <QPlatformTheme> +#include <qpa/qplatformtheme.h> #include <private/qguiapplication_p.h> #if defined(Q_OS_MAC) && !defined(QT_NO_STYLE_MAC) #include <QMacStyle> diff --git a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp index 2b143c5d98..5ae5e20e80 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp @@ -1498,9 +1498,6 @@ 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); @@ -2475,9 +2472,6 @@ 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); @@ -3363,6 +3357,9 @@ void tst_QGraphicsProxyWidget::comboboxWindowFlags() void tst_QGraphicsProxyWidget::updateAndDelete() { +#ifdef Q_OS_MAC + QSKIP("Test case unstable on this platform, QTBUG-23700"); +#endif QGraphicsScene scene; QGraphicsProxyWidget *proxy = scene.addWidget(new QPushButton("Hello World")); View view(&scene); @@ -3371,6 +3368,8 @@ void tst_QGraphicsProxyWidget::updateAndDelete() qt_x11_wait_for_window_manager(&view); #endif QTRY_VERIFY(view.npaints > 0); + // Wait a bit to clear all pending paint events + QTest::qWait(10); const QRect itemDeviceBoundingRect = proxy->deviceTransform(view.viewportTransform()) .mapRect(proxy->boundingRect()).toRect(); @@ -3382,13 +3381,7 @@ void tst_QGraphicsProxyWidget::updateAndDelete() // Update and hide. proxy->update(); proxy->hide(); -#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/itemviews/qheaderview/tst_qheaderview.cpp b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp index 3846433e29..75a7360699 100644 --- a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp +++ b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp @@ -577,7 +577,7 @@ void tst_QHeaderView::oneSectionSize() model.cols = 1; model.rows = 1; - view.setResizeMode(QHeaderView::Interactive); + view.setSectionResizeMode(QHeaderView::Interactive); view.setModel(&model); view.show(); @@ -1150,13 +1150,13 @@ void tst_QHeaderView::resizeMode() { // resizeMode must not be called with an invalid index int last = view->count() - 1; - view->setResizeMode(QHeaderView::Interactive); + view->setSectionResizeMode(QHeaderView::Interactive); QCOMPARE(view->sectionResizeMode(last), QHeaderView::Interactive); QCOMPARE(view->sectionResizeMode(1), QHeaderView::Interactive); - view->setResizeMode(QHeaderView::Stretch); + view->setSectionResizeMode(QHeaderView::Stretch); QCOMPARE(view->sectionResizeMode(last), QHeaderView::Stretch); QCOMPARE(view->sectionResizeMode(1), QHeaderView::Stretch); - view->setResizeMode(QHeaderView::Custom); + view->setSectionResizeMode(QHeaderView::Custom); QCOMPARE(view->sectionResizeMode(last), QHeaderView::Custom); QCOMPARE(view->sectionResizeMode(1), QHeaderView::Custom); @@ -1349,7 +1349,7 @@ void tst_QHeaderView::unhideSection() view->setSectionHidden(0, true); QCOMPARE(view->sectionsHidden(), true); QVERIFY(view->sectionSize(0) == 0); - view->setResizeMode(QHeaderView::Interactive); + view->setSectionResizeMode(QHeaderView::Interactive); view->setSectionHidden(0, false); QVERIFY(view->sectionSize(0) > 0); @@ -1357,7 +1357,7 @@ void tst_QHeaderView::unhideSection() QVERIFY(view->sectionSize(0) == 0); view->setSectionHidden(0, true); QVERIFY(view->sectionSize(0) == 0); - view->setResizeMode(QHeaderView::Stretch); + view->setSectionResizeMode(QHeaderView::Stretch); view->setSectionHidden(0, false); QVERIFY(view->sectionSize(0) > 0); @@ -1462,7 +1462,7 @@ void tst_QHeaderView::hiddenSectionCount() QCOMPARE(view->hiddenSectionCount(), 5); - view->setResizeMode(QHeaderView::Stretch); + view->setSectionResizeMode(QHeaderView::Stretch); QCOMPARE(view->hiddenSectionCount(), 5); // Remove some rows and make sure they are now still counted @@ -1717,7 +1717,7 @@ void tst_QHeaderView::globalResizeMode() QHeaderView h((Qt::Orientation)direction); h.setModel(&m); - h.setResizeMode((QHeaderView::ResizeMode)mode); + h.setSectionResizeMode((QHeaderView::ResizeMode)mode); m.insertRow(insert); for (int i = 0; i < h.count(); ++i) QCOMPARE(h.sectionResizeMode(i), (QHeaderView::ResizeMode)mode); @@ -2095,7 +2095,7 @@ void tst_QHeaderView::QTBUG7833_sectionClicked() tv.horizontalHeader()->setSortIndicatorShown(true); tv.horizontalHeader()->setSectionsClickable(true); tv.horizontalHeader()->setStretchLastSection(true); - tv.horizontalHeader()->setResizeMode(QHeaderView::Interactive); + tv.horizontalHeader()->setSectionResizeMode(QHeaderView::Interactive); tv.setModel(proxyModel); tv.setColumnHidden(5, true); @@ -2172,7 +2172,7 @@ void tst_QHeaderView::QTBUG14242_hideSectionAutoSize() qtv.setModel(&amodel); QHeaderView *hv = qtv.verticalHeader(); hv->setDefaultSectionSize(25); - hv->setResizeMode(QHeaderView::ResizeToContents); + hv->setSectionResizeMode(QHeaderView::ResizeToContents); qtv.show(); hv->hideSection(0); diff --git a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp index be649db9d8..a6330aac17 100644 --- a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp +++ b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp @@ -57,7 +57,7 @@ #if defined(Q_OS_WIN) || defined(Q_OS_WINCE) # include <windows.h> # include <QtGui/QGuiApplication> -# include <QtGui/QPlatformNativeInterface> +#include <qpa/qplatformnativeinterface.h> #endif // Q_OS_WIN #if defined(Q_OS_WIN) || defined(Q_OS_WINCE) diff --git a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp index 0c396aac60..a2806190f1 100644 --- a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp +++ b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp @@ -4067,7 +4067,7 @@ void tst_QTableView::taskQTBUG_10169_sizeHintForRow() QStandardItemModel model(1, 3); model.setData(model.index(0, 0), "Word wrapping text goes here."); tableView.setModel(&model); - tableView.verticalHeader()->setResizeMode(QHeaderView::ResizeToContents); + tableView.verticalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents); const int orderedHeight = tableView.sizeHintForRow(0); tableView.horizontalHeader()->moveSection(2, 0); const int reorderedHeight = tableView.sizeHintForRow(0); diff --git a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp index 6c082fe35f..b0b55a73bc 100644 --- a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp +++ b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp @@ -3608,7 +3608,7 @@ void tst_QTreeView::task250683_wrongSectionSize() { QDirModel model; QTreeView treeView; - treeView.header()->setResizeMode(QHeaderView::ResizeToContents); + treeView.header()->setSectionResizeMode(QHeaderView::ResizeToContents); treeView.setModel(&model); treeView.setColumnHidden(2, true); treeView.setColumnHidden(3, true); diff --git a/tests/auto/widgets/kernel/qaction/tst_qaction.cpp b/tests/auto/widgets/kernel/qaction/tst_qaction.cpp index 51123af953..71f655b197 100644 --- a/tests/auto/widgets/kernel/qaction/tst_qaction.cpp +++ b/tests/auto/widgets/kernel/qaction/tst_qaction.cpp @@ -46,7 +46,7 @@ #include <qevent.h> #include <qaction.h> #include <qmenu.h> -#include <qplatformtheme_qpa.h> +#include <qpa/qplatformtheme.h> #include <private/qguiapplication_p.h> class tst_QAction : public QObject diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp index 6e88c6e74e..710b81779a 100644 --- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp +++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp @@ -83,8 +83,8 @@ #ifdef Q_OS_WIN # include <QtCore/qt_windows.h> # include <QtGui/private/qguiapplication_p.h> -# include <QtGui/QPlatformNativeInterface> -# include <QtGui/QPlatformIntegration> +#include <qpa/qplatformnativeinterface.h> +#include <qpa/qplatformintegration.h> static HWND winHandleOf(const QWidget *w) { diff --git a/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp b/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp index be33381620..78d9d36bc9 100644 --- a/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp +++ b/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp @@ -91,9 +91,6 @@ void tst_QWidget_window::cleanupTestCase() void tst_QWidget_window::tst_move_show() { -#ifdef Q_OS_WIN - QSKIP("QTBUG-25331"); -#endif QWidget w; w.move(100, 100); w.show(); diff --git a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp index 90b5a88805..18a8666f26 100644 --- a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp +++ b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp @@ -44,7 +44,7 @@ #include "qcombobox.h" #include <private/qcombobox_p.h> #include <private/qguiapplication_p.h> -#include <qplatformtheme_qpa.h> +#include <qpa/qplatformtheme.h> #include <qfontcombobox.h> #include <qdesktopwidget.h> diff --git a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp index 22e05a8871..91827eca6d 100644 --- a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp +++ b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp @@ -48,7 +48,7 @@ #include "qvalidator.h" #include "qcompleter.h" #include "qstandarditemmodel.h" -#include "qplatformtheme_qpa.h" +#include <qpa/qplatformtheme.h> #include "qstylehints.h" #include <private/qguiapplication_p.h> |