diff options
author | Mitch Curtis <mitch.curtis@theqtcompany.com> | 2016-05-02 15:11:27 +0200 |
---|---|---|
committer | Mitch Curtis <mitch.curtis@qt.io> | 2016-05-10 12:50:04 +0000 |
commit | 064a7ac884aa47cb3f679c703873305b5817ade3 (patch) | |
tree | 821be353aac713a215db700d7b369fa3b2f494da /tests/auto/snippets/tst_snippets.cpp | |
parent | 28b2f4b090f971c79bc1e2f9afa2b1424c0bd642 (diff) |
customize.qdoc: Use standalone snippets
So that we don't refer to internal types, as these make copying and
pasting snippets difficult.
Change-Id: I6f3b943d2eed48beb7a64690c707924e2c5a8078
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'tests/auto/snippets/tst_snippets.cpp')
-rw-r--r-- | tests/auto/snippets/tst_snippets.cpp | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/tests/auto/snippets/tst_snippets.cpp b/tests/auto/snippets/tst_snippets.cpp index 161e0fe0..cc473a3d 100644 --- a/tests/auto/snippets/tst_snippets.cpp +++ b/tests/auto/snippets/tst_snippets.cpp @@ -51,6 +51,7 @@ private slots: private: QMap<QString, QStringPair> filePaths; + QStringList nonVisualSnippets; }; void tst_Snippets::initTestCase() @@ -63,12 +64,16 @@ void tst_Snippets::initTestCase() qInfo() << datadir; - QDirIterator it(datadir, QStringList() << "qtquick*.qml" << "qtlabs*.qml", QDir::Files | QDir::Readable, QDirIterator::Subdirectories); + QDirIterator it(datadir, QStringList() << "qtquick*-custom.qml" << "qtlabs-custom*.qml", QDir::Files | QDir::Readable, QDirIterator::Subdirectories); while (it.hasNext()) { QFileInfo fi(it.next()); filePaths.insert(fi.baseName(), qMakePair(fi.filePath(), outdir.filePath(fi.baseName() + ".png"))); } QVERIFY(!filePaths.isEmpty()); + + nonVisualSnippets << "qtquickcontrols2-stackview-custom.qml" + << "qtquickcontrols2-swipeview-custom.qml" + << "qtquickcontrols2-tooltip-custom.qml"; } Q_DECLARE_METATYPE(QList<QQmlError>) @@ -95,11 +100,21 @@ void tst_Snippets::screenshots() view.requestActivate(); QVERIFY(QTest::qWaitForWindowActive(&view)); - QSharedPointer<QQuickItemGrabResult> result = view.contentItem()->grabToImage(); - QSignalSpy spy(result.data(), SIGNAL(ready())); - QVERIFY(spy.isValid()); - QVERIFY(spy.wait()); - QVERIFY(result->saveToFile(output)); + bool generateScreenshot = true; + foreach (const QString &baseName, nonVisualSnippets) { + if (input.contains(baseName)) { + generateScreenshot = false; + break; + } + } + + if (generateScreenshot) { + QSharedPointer<QQuickItemGrabResult> result = view.contentItem()->grabToImage(); + QSignalSpy spy(result.data(), SIGNAL(ready())); + QVERIFY(spy.isValid()); + QVERIFY(spy.wait()); + QVERIFY(result->saveToFile(output)); + } QGuiApplication::processEvents(); } |