diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-09 12:15:59 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-17 12:44:43 +0100 |
commit | 3146dcbdc768c90a03b58eed3f42630604443093 (patch) | |
tree | 10e234460c5f57012b346cdbe6304002ad0a446d /tests/auto/declarative/examples/tst_examples.cpp | |
parent | a7ea2afffd61e2a89f7bb2c586b4b733c4996bb5 (diff) | |
parent | 722725cf24e45e86a2844810b90787a29df8a4a9 (diff) |
Merge branch 'stable' into dev
Conflicts:
sync.profile
tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
Change-Id: I3620d15b4163fec420d18f6be50cae1635b99a2f
Diffstat (limited to 'tests/auto/declarative/examples/tst_examples.cpp')
-rw-r--r-- | tests/auto/declarative/examples/tst_examples.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/declarative/examples/tst_examples.cpp b/tests/auto/declarative/examples/tst_examples.cpp index 1c57b04f..1d7aa0f9 100644 --- a/tests/auto/declarative/examples/tst_examples.cpp +++ b/tests/auto/declarative/examples/tst_examples.cpp @@ -68,7 +68,8 @@ tst_examples::tst_examples() { // Add directories you want excluded here excludedDirs << "doc/src/snippets/declarative/visualdatamodel_rootindex" - << "doc/src/snippets/declarative/qtbinding"; + << "doc/src/snippets/declarative/qtbinding" + << "examples/declarative/tutorials"; //Excluded when tutorials were moved into examples (not checked before) // Known to violate naming conventions, QTQAINFRA-428 excludedDirs << "demos/mobile/qtbubblelevel/qml" << "demos/mobile/quickhit"; |