diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-14 11:35:11 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-14 11:35:30 +0200 |
commit | 809b5e2fc1cc5935c2dd7d63992c7a94dfce4dd8 (patch) | |
tree | c0f08d106a16f12a89e13550d58d424d0f9cba6a /tests/benchmarks/qml/js/js.pro | |
parent | dc4e537d4cfe16aaa88b6edd911571317241ab32 (diff) | |
parent | da7df10b3d5769d1da7851895d27257a0d930012 (diff) |
Merge remote-tracking branch 'origin/5.3' into 5.4
Change-Id: I2e06c2fcd8aa9d5d090f0568be75272ec82f7b20
Diffstat (limited to 'tests/benchmarks/qml/js/js.pro')
-rw-r--r-- | tests/benchmarks/qml/js/js.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/benchmarks/qml/js/js.pro b/tests/benchmarks/qml/js/js.pro index b1448d8eb8..7711e7130d 100644 --- a/tests/benchmarks/qml/js/js.pro +++ b/tests/benchmarks/qml/js/js.pro @@ -1,7 +1,7 @@ TEMPLATE = subdirs SUBDIRS = \ qjsengine \ - qjsvalue \ +# qjsvalue \ ### FIXME: doesn't build qjsvalueiterator \ TRUSTED_BENCHMARKS += \ |