From bf8de28190bb0ac5cbcde550fdfb86f42c504f00 Mon Sep 17 00:00:00 2001 From: Frans Englich Date: Wed, 19 Aug 2009 16:55:47 +0200 Subject: Ifdef compiler workaround. Addresses review comment. --- tests/auto/qcombobox/tst_qcombobox.cpp | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/tests/auto/qcombobox/tst_qcombobox.cpp b/tests/auto/qcombobox/tst_qcombobox.cpp index c364129..9700839 100644 --- a/tests/auto/qcombobox/tst_qcombobox.cpp +++ b/tests/auto/qcombobox/tst_qcombobox.cpp @@ -2260,7 +2260,11 @@ void tst_QComboBox::setItemDelegate() QComboBox comboBox; QStyledItemDelegate *itemDelegate = new QStyledItemDelegate; comboBox.setItemDelegate(itemDelegate); - QCOMPARE(static_cast(comboBox.itemDelegate()), itemDelegate); + QCOMPARE( +#ifdef Q_CC_MWERKS + static_cast +#endif + (comboBox.itemDelegate()), itemDelegate); } void tst_QComboBox::task253944_itemDelegateIsReset() @@ -2270,10 +2274,18 @@ void tst_QComboBox::task253944_itemDelegateIsReset() comboBox.setItemDelegate(itemDelegate); comboBox.setEditable(true); - QCOMPARE(static_cast(comboBox.itemDelegate()), itemDelegate); + QCOMPARE( +#ifdef Q_CC_MWERKS + static_cast +#endif + (comboBox.itemDelegate()), itemDelegate); comboBox.setStyleSheet("QComboBox { border: 1px solid gray; }"); - QCOMPARE(static_cast(comboBox.itemDelegate()), itemDelegate); + QCOMPARE( +#ifdef Q_CC_MWERKS + static_cast +#endif + (comboBox.itemDelegate()), itemDelegate); } -- cgit v0.12