diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2009-07-15 05:46:19 (GMT) |
|---|---|---|
| committer | Yann Bodson <yann.bodson@nokia.com> | 2009-07-15 05:46:19 (GMT) |
| commit | dd71ad09040c2d615079fe6fde12a752856d043d (patch) | |
| tree | 573d004196802ca402244879ba29accb5281b6b9 /tools/qmlviewer | |
| parent | 46fa45fd0f2a40580951903437a5fd1b6c5237ad (diff) | |
| parent | 68e47e91af6edca3c714cc3258b65dd88c0ee1e4 (diff) | |
| download | Qt-dd71ad09040c2d615079fe6fde12a752856d043d.zip Qt-dd71ad09040c2d615079fe6fde12a752856d043d.tar.gz Qt-dd71ad09040c2d615079fe6fde12a752856d043d.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'tools/qmlviewer')
| -rw-r--r-- | tools/qmlviewer/main.cpp | 1 | ||||
| -rw-r--r-- | tools/qmlviewer/qmlviewer.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/tools/qmlviewer/main.cpp b/tools/qmlviewer/main.cpp index 0b370fb..5e5a50a 100644 --- a/tools/qmlviewer/main.cpp +++ b/tools/qmlviewer/main.cpp @@ -164,4 +164,3 @@ int main(int argc, char ** argv) return app.exec(); } - diff --git a/tools/qmlviewer/qmlviewer.cpp b/tools/qmlviewer/qmlviewer.cpp index 677c08b..39cb82b 100644 --- a/tools/qmlviewer/qmlviewer.cpp +++ b/tools/qmlviewer/qmlviewer.cpp @@ -330,7 +330,7 @@ void QmlViewer::toggleRecording() void QmlViewer::addLibraryPath(const QString& lib) { - canvas->engine()->addNameSpacePath("",lib); + canvas->engine()->addImportPath(lib); } void QmlViewer::reload() |