summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Arve <jan-arve.saether@nokia.com>2009-09-30 11:39:49 (GMT)
committerAlexis Menard <alexis.menard@trolltech.com>2009-09-30 11:47:23 (GMT)
commitbdf7020103bc9698584005935f00cd874f841a49 (patch)
tree43bd37c057b25ba6d53cbfca0fb8941ca2a53b6b
parentd6244e6e5f8bb769176e07e957ec5ce93be72b55 (diff)
downloadQt-bdf7020103bc9698584005935f00cd874f841a49.zip
Qt-bdf7020103bc9698584005935f00cd874f841a49.tar.gz
Qt-bdf7020103bc9698584005935f00cd874f841a49.tar.bz2
Make the automaticReparenting autotest pass on Mac.
On Mac, all autotests will use the release version of Qt, regardless of how the autotest was built
-rw-r--r--tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp b/tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp
index feaedd9..69a64ee 100644
--- a/tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp
+++ b/tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp
@@ -153,7 +153,7 @@ void tst_QGraphicsLayout::automaticReparenting()
QGraphicsWidget *ww = new QGraphicsWidget();
QGraphicsLinearLayout *l1 = new QGraphicsLinearLayout(ww);
-#ifdef QT_DEBUG
+#if !defined(Q_OS_MAC) && defined(QT_DEBUG)
QTest::ignoreMessage(QtWarningMsg, "QGraphicsLayout::addChildLayoutItem: QGraphicsWidget \"\""
" in wrong parent; moved to correct parent");
#endif