diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2012-12-18 12:14:34 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-19 08:36:47 +0100 |
| commit | b7119dc2cb8fa827e80cf3748fa4d211d4aa073e (patch) | |
| tree | 88a5334074ba33411f9f5bd442ef8d74a6f3d328 | |
| parent | 5e4cc79e0669b76f8f5bf5192a0b7001ff8f4d58 (diff) | |
Fix tst_qqmlbundle on Windows.
The plugin was not found since it was in the Release/Debug
subfolder, respectively.
Task-number: QTBUG-28611
Change-Id: Ieaea7c67e2524a7d0ca3011d96f31b15929e551c
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
| -rw-r--r-- | tests/auto/qml/qqmlbundle/data/imports/bundletest/plugin1.pro | 1 | ||||
| -rw-r--r-- | tests/auto/qml/qqmlbundle/tst_qqmlbundle.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/qml/qqmlbundle/data/imports/bundletest/plugin1.pro b/tests/auto/qml/qqmlbundle/data/imports/bundletest/plugin1.pro index 2ffa05a007..934bb2d591 100644 --- a/tests/auto/qml/qqmlbundle/data/imports/bundletest/plugin1.pro +++ b/tests/auto/qml/qqmlbundle/data/imports/bundletest/plugin1.pro @@ -3,4 +3,5 @@ CONFIG += plugin SOURCES += plugin.cpp QT = core qml +DESTDIR = ./ DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qml/qqmlbundle/tst_qqmlbundle.cpp b/tests/auto/qml/qqmlbundle/tst_qqmlbundle.cpp index 70cb319938..168e685699 100644 --- a/tests/auto/qml/qqmlbundle/tst_qqmlbundle.cpp +++ b/tests/auto/qml/qqmlbundle/tst_qqmlbundle.cpp @@ -201,7 +201,7 @@ void tst_qqmlbundle::import() engine.addImportPath(testFile("imports")); QQmlComponent component(&engine, testFileUrl("import.qml")); - QVERIFY(component.isReady()); + QVERIFY2(component.isReady(), QQmlDataTest::msgComponentError(component, &engine)); QObject *o = component.create(); QVERIFY(o != 0); |