aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2017-05-03 22:29:58 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2017-05-04 07:34:02 +0000
commit0efd4f15979cc6186cae3f29613245aa457bc170 (patch)
tree1d92c92e895564635ca3d14d184f64c09388ae8f
parent3af18224190d2c008a4ed6fe39b07e60db5dc683 (diff)
Cleanup obsolete references to doc/snippets/screenshots
Change-Id: Ia631cd493d695aaac44d612f234756b4e5b558dd Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
-rw-r--r--src/imports/controls/doc/qtquickcontrols2.qdocconf3
-rw-r--r--tests/auto/sanity/tst_sanity.cpp2
2 files changed, 2 insertions, 3 deletions
diff --git a/src/imports/controls/doc/qtquickcontrols2.qdocconf b/src/imports/controls/doc/qtquickcontrols2.qdocconf
index 42ff16f8..7f05247e 100644
--- a/src/imports/controls/doc/qtquickcontrols2.qdocconf
+++ b/src/imports/controls/doc/qtquickcontrols2.qdocconf
@@ -36,8 +36,7 @@ depends = qtcore qtgui qtdoc qtqml qtquick qtquickdialogs qtquickcontrols qtquic
# \example controls/tabs
exampledirs += ../../../../examples/quickcontrols2 \
../../../quicktemplates2 \
- snippets \
- snippets/screenshots
+ snippets
examplesinstallpath = quickcontrols2
diff --git a/tests/auto/sanity/tst_sanity.cpp b/tests/auto/sanity/tst_sanity.cpp
index 8d3fee7b..2988c96c 100644
--- a/tests/auto/sanity/tst_sanity.cpp
+++ b/tests/auto/sanity/tst_sanity.cpp
@@ -139,7 +139,7 @@ private:
void tst_Sanity::initTestCase()
{
QDirIterator it(QQC2_IMPORT_PATH, QStringList() << "*.qml" << "*.js", QDir::Files, QDirIterator::Subdirectories);
- const QStringList excludeDirs = QStringList() << QStringLiteral("snippets") << QStringLiteral("screenshots") << QStringLiteral("designer");
+ const QStringList excludeDirs = QStringList() << QStringLiteral("snippets") << QStringLiteral("designer");
while (it.hasNext()) {
it.next();
QFileInfo info = it.fileInfo();