diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-04-05 10:03:49 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-04-08 12:16:23 +0000 |
commit | 5a5441f38e0529d852536b776cd9f26dad410e62 (patch) | |
tree | d1a5560c13f6f6e9e2bb27ae7de1619c6d216e39 /tests/auto/particles/shared/particlestestsshared.h | |
parent | 0a9491d6ca95e2fdeb6c1eaef35beaa095eace5a (diff) |
Tests: Fix warnings about ignoring return value of QTest::qWaitForWindowExposed()
Fix warnings like:
../shared/particlestestsshared.h: In function 'QQuickView* createView(const QUrl&, int)':
../shared/particlestestsshared.h:64:33: warning: ignoring return value of 'bool QTest::qWaitForWindowExposed(QWindow*, int)', declared with attribute nodiscard [-Wunused-result]
by checking the return and adding some handling.
Change-Id: I1390f9738430042fcc45e243567a9d5a4f632a6d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'tests/auto/particles/shared/particlestestsshared.h')
-rw-r--r-- | tests/auto/particles/shared/particlestestsshared.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/tests/auto/particles/shared/particlestestsshared.h b/tests/auto/particles/shared/particlestestsshared.h index 5ef1d2cabb..e1fc6f4ccd 100644 --- a/tests/auto/particles/shared/particlestestsshared.h +++ b/tests/auto/particles/shared/particlestestsshared.h @@ -31,6 +31,8 @@ #include <QtQuick/QQuickView> #include <QtTest> #include <QAbstractAnimation> +#include <QScopedPointer> + const qreal EPSILON = 0.0001; bool extremelyFuzzyCompare(qreal a, qreal b, qreal e)//For cases which can have larger variances @@ -55,17 +57,18 @@ bool myFuzzyGEQ(qreal a, qreal b) QQuickView* createView(const QUrl &filename, int additionalWait=0) { - QQuickView *view = new QQuickView(0); + QScopedPointer<QQuickView> view(new QQuickView(nullptr)); view->setSource(filename); if (view->status() != QQuickView::Ready) - return 0; + return nullptr; view->show(); - QTest::qWaitForWindowExposed(view); + if (!QTest::qWaitForWindowExposed(view.data())) + return nullptr; if (additionalWait) QTest::qWait(additionalWait); - return view; + return view.take(); } void ensureAnimTime(int requiredTime, QAbstractAnimation* anim)//With consistentTiming, who knows how long an animation really takes... |