diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-09-30 11:51:43 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-09-30 11:51:43 (GMT) |
| commit | 28be44a363468f1d3cf0a041c3daf88893820edd (patch) | |
| tree | 00f59c1c6e7aa60bd92ed2aa597871551a88d7d2 /tests | |
| parent | 849e46599f0751ba5994d036df140d10e76e223c (diff) | |
| parent | bdf7020103bc9698584005935f00cd874f841a49 (diff) | |
| download | Qt-28be44a363468f1d3cf0a041c3daf88893820edd.zip Qt-28be44a363468f1d3cf0a041c3daf88893820edd.tar.gz Qt-28be44a363468f1d3cf0a041c3daf88893820edd.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6
Diffstat (limited to 'tests')
| -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 |