From 2564ed5168b61e81deb0d847a9a8d24dbfa6b84d Mon Sep 17 00:00:00 2001 From: Frans Englich Date: Thu, 20 Aug 2009 16:30:19 +0200 Subject: Fix build, the preprocessor is broken on windows. --- tests/auto/qcombobox/tst_qcombobox.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'tests/auto/qcombobox/tst_qcombobox.cpp') diff --git a/tests/auto/qcombobox/tst_qcombobox.cpp b/tests/auto/qcombobox/tst_qcombobox.cpp index 970083973d..b568c602c9 100644 --- a/tests/auto/qcombobox/tst_qcombobox.cpp +++ b/tests/auto/qcombobox/tst_qcombobox.cpp @@ -2260,11 +2260,11 @@ void tst_QComboBox::setItemDelegate() QComboBox comboBox; QStyledItemDelegate *itemDelegate = new QStyledItemDelegate; comboBox.setItemDelegate(itemDelegate); - QCOMPARE( #ifdef Q_CC_MWERKS - static_cast + QCOMPARE(static_cast(comboBox.itemDelegate()), itemDelegate); +#else + QCOMPARE(comboBox.itemDelegate(), itemDelegate); #endif - (comboBox.itemDelegate()), itemDelegate); } void tst_QComboBox::task253944_itemDelegateIsReset() @@ -2274,18 +2274,18 @@ void tst_QComboBox::task253944_itemDelegateIsReset() comboBox.setItemDelegate(itemDelegate); comboBox.setEditable(true); - QCOMPARE( #ifdef Q_CC_MWERKS - static_cast + QCOMPARE(static_cast(comboBox.itemDelegate()), itemDelegate); +#else + QCOMPARE(comboBox.itemDelegate(), itemDelegate); #endif - (comboBox.itemDelegate()), itemDelegate); comboBox.setStyleSheet("QComboBox { border: 1px solid gray; }"); - QCOMPARE( #ifdef Q_CC_MWERKS - static_cast + QCOMPARE(static_cast(comboBox.itemDelegate()), itemDelegate); +#else + QCOMPARE(comboBox.itemDelegate(), itemDelegate); #endif - (comboBox.itemDelegate()), itemDelegate); } -- cgit v1.2.3