Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

Conflicts:
	src/declarative/qml/qmlscriptparser.cpp
	src/declarative/qml/qmlscriptparser_p.h

Compiles, but probably next needs a revert/change of module stuff,
since that work seems to have been duplicated.

2 files changed, 0 insertions, 9 deletions

diff --git a/tools/qmlviewer/main.cpp b/tools/qmlviewer/main.cpp
index 0b370fb..335c609 100644
--- a/tools/qmlviewer/main.cpp
+++ b/tools/qmlviewer/main.cpp
@@ -124,8 +124,6 @@ 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") {
@@ -140,8 +138,6 @@ 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)
diff --git a/tools/qmlviewer/qmlviewer.cpp b/tools/qmlviewer/qmlviewer.cpp
index db0dc18..e212391 100644
--- a/tools/qmlviewer/qmlviewer.cpp
+++ b/tools/qmlviewer/qmlviewer.cpp
@@ -325,11 +325,6 @@ void QmlViewer::toggleRecording()
     setRecording(recording);
 }
 
-void QmlViewer::addLibraryPath(const QString& lib)
-{
-    canvas->engine()->addNameSpacePath("",lib);
-}
-
 void QmlViewer::reload()
 {
     openQml(currentFileName);