diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-18 12:27:03 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-18 12:27:04 +0100 |
| commit | 72ea7900858a31c1c6b93e6fed9f2f4dc30291e4 (patch) | |
| tree | 89c4dd69ad88dde8ec506dbf1a2fae79ef454914 /tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp | |
| parent | aafbd7392ead765c2038a1ac6b569d083effb81d (diff) | |
| parent | eb122a6fe4de5b95acb287f92c6ca5e81864b1c6 (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: Ie6d44caf1d630cb029178a1af40c637f24a25ee7
Diffstat (limited to 'tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp')
| -rw-r--r-- | tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp index b45ce88c83..6c26ddb293 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp @@ -6458,6 +6458,12 @@ public: void tst_QGraphicsItem::ensureUpdateOnTextItem() { +#ifdef Q_OS_MAC + if (QSysInfo::MacintoshVersion == QSysInfo::MV_10_7) { + QSKIP("This test is unstable on 10.7 in CI"); + } +#endif + QGraphicsScene scene; QGraphicsView view(&scene); view.show(); |