diff options
| author | Frans Englich <frans.englich@nokia.com> | 2009-08-20 16:30:19 +0200 |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2009-08-20 16:30:19 +0200 |
| commit | 2564ed5168b61e81deb0d847a9a8d24dbfa6b84d (patch) | |
| tree | 66448f1336fe3c89bea37ae2be0b25e7cdb7953a /tests/auto | |
| parent | 1ec40470e6817ba1cd8cc1b06812a369d028dd9b (diff) | |
| download | qt4-tools-2564ed5168b61e81deb0d847a9a8d24dbfa6b84d.tar.gz | |
Fix build, the preprocessor is broken on windows.
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/qcombobox/tst_qcombobox.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
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<QStyledItemDelegate *> + QCOMPARE(static_cast<QStyledItemDelegate *>(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<QStyledItemDelegate *> + QCOMPARE(static_cast<QStyledItemDelegate *>(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<QStyledItemDelegate *> + QCOMPARE(static_cast<QStyledItemDelegate *>(comboBox.itemDelegate()), itemDelegate); +#else + QCOMPARE(comboBox.itemDelegate(), itemDelegate); #endif - (comboBox.itemDelegate()), itemDelegate); } |