From ba21ca7b5b4b92996c93a0dc4137ea181c4eb79c Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Mon, 16 Jan 2012 11:49:53 +0100 Subject: Replace Q_WS_MAC with Q_OS_MAC in tests/auto/widgets MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit tst_qwidget.cpp will not build/link without tst_qwidget_mac_helpers.mm, so re-add it to the build as well. Change-Id: I55130f62c215c4b82683d90456e31fdb09f833a8 Reviewed-by: Samuel Rødal --- tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/auto/widgets/itemviews') diff --git a/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp b/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp index e965b04e26..ebbc40d4f1 100644 --- a/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp +++ b/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp @@ -122,7 +122,7 @@ private slots: void changeDataWithSorting(); void itemData(); void itemWidget(); -#ifndef Q_WS_MAC +#ifndef Q_OS_MAC void fastScroll(); #endif void insertUnchanged(); @@ -1489,7 +1489,7 @@ void tst_QListWidget::itemWidget() QCOMPARE(list.itemWidget(item), static_cast(0)); } -#ifndef Q_WS_MAC +#ifndef Q_OS_MAC class MyListWidget : public QListWidget { public: @@ -1537,7 +1537,7 @@ void tst_QListWidget::fastScroll() // only one item should be repainted, the rest should be scrolled in memory QCOMPARE(widget.painted.boundingRect().size(), itemSize); } -#endif // Q_WS_MAC +#endif // Q_OS_MAC void tst_QListWidget::insertUnchanged() { -- cgit v1.2.3