diff options
| author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2012-07-20 13:28:02 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-23 16:00:04 (GMT) |
| commit | 40d8205ef4a8b03b0b66432775b6ba8b62acb91f (patch) | |
| tree | b878a19a461d639e0a8944f6a46a53f60a985824 | |
| parent | d1ff987835c459513dbce0c48fc40c6cdcbe1134 (diff) | |
| download | Qt-40d8205ef4a8b03b0b66432775b6ba8b62acb91f.zip Qt-40d8205ef4a8b03b0b66432775b6ba8b62acb91f.tar.gz Qt-40d8205ef4a8b03b0b66432775b6ba8b62acb91f.tar.bz2 | |
tests: Re-enable tst_QSharedPointer_and_QWidget test.
This test crashes so skipping it with QSKIP and re-enable
the test.
Task-number: QTBUG-26594
Change-Id: I8a22313b59bbe227ef0d7489fe344734c02ad970
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| -rw-r--r-- | tests/auto/qsharedpointer_and_qwidget/qsharedpointer_and_qwidget.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qsharedpointer_and_qwidget/tst_qsharedpointer_and_qwidget.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/auto/qsharedpointer_and_qwidget/qsharedpointer_and_qwidget.pro b/tests/auto/qsharedpointer_and_qwidget/qsharedpointer_and_qwidget.pro index c542d7d..db647a5 100644 --- a/tests/auto/qsharedpointer_and_qwidget/qsharedpointer_and_qwidget.pro +++ b/tests/auto/qsharedpointer_and_qwidget/qsharedpointer_and_qwidget.pro @@ -1,5 +1,3 @@ load(qttest_p4) SOURCES += tst_qsharedpointer_and_qwidget.cpp DEFINES += SRCDIR=\\\"$$PWD/\\\" - -CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qsharedpointer_and_qwidget/tst_qsharedpointer_and_qwidget.cpp b/tests/auto/qsharedpointer_and_qwidget/tst_qsharedpointer_and_qwidget.cpp index cfd3212..4bcb655 100644 --- a/tests/auto/qsharedpointer_and_qwidget/tst_qsharedpointer_and_qwidget.cpp +++ b/tests/auto/qsharedpointer_and_qwidget/tst_qsharedpointer_and_qwidget.cpp @@ -131,6 +131,9 @@ void tst_QSharedPointer_and_QWidget::strong_weak() void tst_QSharedPointer_and_QWidget::strong_sharedptrDelete() { +#ifndef Q_WS_QWS + QSKIP("QTBUG-26594", SkipAll); +#endif QWidget *parent = new QWidget; QSharedPointer<QWidget> ptr(new QWidget(parent)); QWeakPointer<QWidget> weak = ptr; |