diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-07-12 23:46:39 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-07-12 23:46:39 (GMT) |
| commit | 4ca1f77ab54f1e02045dc7e680bd99103f680fea (patch) | |
| tree | 3d947d55e6d2c75faf263d555d5237bb73c59582 /tools/qmlviewer/main.cpp | |
| parent | 5b56189c9a6c322fa595b716a9f17e39a35bcbc0 (diff) | |
| parent | 66c9d55e58fd9ee9a80270e63a8ebba52db00904 (diff) | |
| download | Qt-4ca1f77ab54f1e02045dc7e680bd99103f680fea.zip Qt-4ca1f77ab54f1e02045dc7e680bd99103f680fea.tar.gz Qt-4ca1f77ab54f1e02045dc7e680bd99103f680fea.tar.bz2 | |
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.
Diffstat (limited to 'tools/qmlviewer/main.cpp')
| -rw-r--r-- | tools/qmlviewer/main.cpp | 4 |
1 files changed, 0 insertions, 4 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) |