diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-03 13:27:13 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-03 13:27:13 +0100 |
| commit | f2244103ff7a9b61fc7bcb7e920d8cc6b2f5f226 (patch) | |
| tree | 8fe753743c46d4a652f582a7a2a49e5709eaa6e0 /tests/auto/qml/qmlmin | |
| parent | 57430b2bdad32150e0ed8ceb6893430363ee6670 (diff) | |
| parent | 164af37710e5721cbc7d79a0af20f2387181c59c (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
tools/qmlprofiler/qmlprofilerclient.cpp
Change-Id: I1de8832fefd0e45fea16ca072b6c7ae44fa376d4
Diffstat (limited to 'tests/auto/qml/qmlmin')
| -rw-r--r-- | tests/auto/qml/qmlmin/tst_qmlmin.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/qml/qmlmin/tst_qmlmin.cpp b/tests/auto/qml/qmlmin/tst_qmlmin.cpp index d2e8526896..6d2fba3f46 100644 --- a/tests/auto/qml/qmlmin/tst_qmlmin.cpp +++ b/tests/auto/qml/qmlmin/tst_qmlmin.cpp @@ -87,6 +87,7 @@ void tst_qmlmin::initTestCase() excludedDirs << "doc/src/snippets/qtquick1/qtbinding"; excludedDirs << "doc/src/snippets/qtquick1/imports"; excludedDirs << "tests/manual/v4"; + excludedDirs << "tests/auto/qml/qmllint"; // Add invalid files (i.e. files with syntax errors) invalidFiles << "tests/auto/quick/qquickloader/data/InvalidSourceComponent.qml"; |