diff options
| author | João Abecasis <joao.abecasis@nokia.com> | 2012-01-16 17:52:29 +0100 |
|---|---|---|
| committer | João Abecasis <joao.abecasis@nokia.com> | 2012-01-16 17:53:41 +0100 |
| commit | 5b250d497fd798c476765b22a2906e1c0ff1e432 (patch) | |
| tree | fd4215ca375cc2402e536bf670c2977cf64ae2ef /tests/auto/widgets/graphicsview/qgraphicswidget | |
| parent | 2c52e9a5c1d6ef6cbf4577430e14027375465c96 (diff) | |
| parent | 7a0099183a1c107126bda3b59a47651aac612426 (diff) | |
Merge remote-tracking branch 'gerrit/master' into containers
Change-Id: I2d358b912f1055ee6021d13de2f66fd459aaa355
Diffstat (limited to 'tests/auto/widgets/graphicsview/qgraphicswidget')
| -rw-r--r-- | tests/auto/widgets/graphicsview/qgraphicswidget/qgraphicswidget.pro | 3 | ||||
| -rw-r--r-- | tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/auto/widgets/graphicsview/qgraphicswidget/qgraphicswidget.pro b/tests/auto/widgets/graphicsview/qgraphicswidget/qgraphicswidget.pro index afe584e57d..af9ff4d42c 100644 --- a/tests/auto/widgets/graphicsview/qgraphicswidget/qgraphicswidget.pro +++ b/tests/auto/widgets/graphicsview/qgraphicswidget/qgraphicswidget.pro @@ -6,5 +6,6 @@ QT += core-private gui-private SOURCES += tst_qgraphicswidget.cpp - +# QTBUG-23616 - unstable test +linux-*:system(". /etc/lsb-release && [ $DISTRIB_CODENAME = oneiric ]"):CONFIG += insignificant_test mac*:CONFIG+=insignificant_test diff --git a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp index 164d5564e3..89cd63f482 100644 --- a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** |