Libraries and library versioning.

2 files changed, 9 insertions, 1 deletions

diff --git a/tools/qmlviewer/main.cpp b/tools/qmlviewer/main.cpp
index 335c609..5e5a50a 100644
--- a/tools/qmlviewer/main.cpp
+++ b/tools/qmlviewer/main.cpp
@@ -124,6 +124,8 @@ int main(int argc, char ** argv)
                 usage();
             translationFile = argv[i + 1];
             ++i;
+        } else if (arg == "-L") {
+            libraries << QString(argv[++i]);
         } else if (arg[0] != '-') {
             fileName = arg;
         } else if (1 || arg == "-help") {
@@ -138,6 +140,8 @@ int main(int argc, char ** argv)
     }
 
     QmlViewer viewer(testMode, testDir, 0, frameless ? Qt::FramelessWindowHint : Qt::Widget);
+    foreach (QString lib, libraries)
+        viewer.addLibraryPath(lib);
     viewer.setCacheEnabled(cache);
     viewer.setRecordFile(recordfile);
     if (period>0)
@@ -160,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 e212391..a769888 100644
--- a/tools/qmlviewer/qmlviewer.cpp
+++ b/tools/qmlviewer/qmlviewer.cpp
@@ -325,6 +325,11 @@ void QmlViewer::toggleRecording()
     setRecording(recording);
 }
 
+void QmlViewer::addLibraryPath(const QString& lib)
+{
+    canvas->engine()->addImportPath(lib);
+}
+
 void QmlViewer::reload()
 {
     openQml(currentFileName);