aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qmlmin/tst_qmlmin.cpp
diff options
context:
space:
mode:
authorRoberto Raggi <roberto.raggi@nokia.com>2011-09-15 17:06:31 +0200
committerQt by Nokia <qt-info@nokia.com>2011-09-19 12:07:46 +0200
commitb6719dc655485624a5e7acca80e01da9f47dd61d (patch)
tree24e285967b8058a183ee31cfe16b19adeeacdff8 /tests/auto/declarative/qmlmin/tst_qmlmin.cpp
parent749f0f8284901f20e48b9651dd283884defde5d5 (diff)
Add support for minimizing Javascript files containing pragmas.
Change-Id: Ib61d5ea42ec810c36ba782b558461bc09be199dc Reviewed-on: http://codereview.qt-project.org/5016 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Diffstat (limited to 'tests/auto/declarative/qmlmin/tst_qmlmin.cpp')
-rw-r--r--tests/auto/declarative/qmlmin/tst_qmlmin.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/tests/auto/declarative/qmlmin/tst_qmlmin.cpp b/tests/auto/declarative/qmlmin/tst_qmlmin.cpp
index e933e1812a..de67c936b8 100644
--- a/tests/auto/declarative/qmlmin/tst_qmlmin.cpp
+++ b/tests/auto/declarative/qmlmin/tst_qmlmin.cpp
@@ -150,11 +150,6 @@ void tst_qmlmin::qmlMinify()
QCOMPARE(qmlminify.error(), QProcess::UnknownError);
QCOMPARE(qmlminify.exitStatus(), QProcess::NormalExit);
-
- if (file.endsWith(QLatin1String("/PhotoViewerCore/script/script.js")) ||
- file.endsWith(QLatin1String("/samegame/SamegameCore/samegame.js"))) {
- QEXPECT_FAIL("", "This requires .pragma support in the Javascript parser", Continue);
- }
QCOMPARE(qmlminify.exitCode(), 0);
}