diff options
| author | Jani Hautakangas <ext-jani.hautakangas@nokia.com> | 2009-09-30 12:27:36 (GMT) |
|---|---|---|
| committer | Jani Hautakangas <ext-jani.hautakangas@nokia.com> | 2009-09-30 12:27:36 (GMT) |
| commit | 79aee2c16479a1dff1af886a6ccc6b2776ad6537 (patch) | |
| tree | 3a303a9f7a125f9f2f04f04711d3f9a69168a481 /tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp | |
| parent | 3868e92de3b27f3e030b77cfa746888a0dbb39e7 (diff) | |
| parent | 21cfe5bf6550ae359d6bfa937b1308891954e9bb (diff) | |
| download | Qt-79aee2c16479a1dff1af886a6ccc6b2776ad6537.zip Qt-79aee2c16479a1dff1af886a6ccc6b2776ad6537.tar.gz Qt-79aee2c16479a1dff1af886a6ccc6b2776ad6537.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp')
| -rw-r--r-- | tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp | 2 |
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 |