diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-19 12:29:32 +0100 |
|---|---|---|
| committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-19 12:37:03 +0100 |
| commit | 4821058f10118be55a541ad39e25ec9165cca3b3 (patch) | |
| tree | 167973e3c68fc442b0e37d6f628f3fdbe759f15a /tests/auto/qml/parserstress/tst_parserstress.cpp | |
| parent | 83f11e33745180e9370d484cbcedd0bac020c9dd (diff) | |
| parent | 26d5f2e833f0e3686aaa27e695bbfab5fbd808ad (diff) | |
Merge master into api_changes
Conflicts:
src/qml/debugger/qqmlenginedebugservice.cpp
src/qml/qml/v8/qv8qobjectwrapper.cpp
src/quick/util/qquickimageprovider.cpp
tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
Change-Id: Ie78ba2fabd32f4812bcae9dbdd66ed289dc11dcb
Diffstat (limited to 'tests/auto/qml/parserstress/tst_parserstress.cpp')
| -rw-r--r-- | tests/auto/qml/parserstress/tst_parserstress.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/auto/qml/parserstress/tst_parserstress.cpp b/tests/auto/qml/parserstress/tst_parserstress.cpp index a179a24f5f..eb477af521 100644 --- a/tests/auto/qml/parserstress/tst_parserstress.cpp +++ b/tests/auto/qml/parserstress/tst_parserstress.cpp @@ -128,8 +128,7 @@ void tst_parserstress::ecmascript() QQmlComponent component(&engine); - QString dummyFile = QFINDTESTDATA("dummy.qml"); - component.setData(qmlData, QUrl::fromLocalFile(dummyFile)); + component.setData(qmlData, QUrl()); QFileInfo info(file); |