diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-08-31 08:55:16 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-08-31 08:55:16 +0200 |
| commit | 71478352376022faa9be6d79f2a760c289945ff5 (patch) | |
| tree | 0f8ff4a88c1b033367337a93d23a329d145ee903 /tools/qmlplugindump | |
| parent | c38efcb67cf93ba3e91e184c3b891efef4ef75a3 (diff) | |
| parent | 05daa9bfe1a03ffe1cc580b6cfd88e093e2493c0 (diff) | |
Merge branch 'master' into refactor
Conflicts:
src/3rdparty/v8
src/declarative/declarative.pro
src/declarative/items/qsgcanvas.cpp
src/declarative/items/qsgshadereffectsource_p.h
src/declarative/items/qsgview.cpp
src/declarative/particles/qsgcustomparticle.cpp
src/imports/gestures/gestures.pro
src/imports/particles/particles.pro
src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro
src/qtquick1/qtquick1.pro
tests/auto/declarative/examples/examples.pro
tests/auto/declarative/qsglistview/qsglistview.pro
tests/auto/qtquick1/qdeclarativeviewer/qdeclarativeviewer.pro
Change-Id: I423344f83e1835116cad531b877fde6e68a8849a
Diffstat (limited to 'tools/qmlplugindump')
| -rw-r--r-- | tools/qmlplugindump/main.cpp | 13 | ||||
| -rw-r--r-- | tools/qmlplugindump/qmlplugindump.pro | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp index c553070123..c53fd3c7fd 100644 --- a/tools/qmlplugindump/main.cpp +++ b/tools/qmlplugindump/main.cpp @@ -540,6 +540,19 @@ int main(int argc, char *argv[]) engine.addImportPath(pluginImportPath); } + // load the QtQuick 1 plugin + { + QByteArray code("import QtQuick 1.0\nQtObject {}"); + QDeclarativeComponent c(&engine); + c.setData(code, QUrl::fromLocalFile(pluginImportPath + "/loadqtquick1.qml")); + c.create(); + if (!c.errors().isEmpty()) { + foreach (const QDeclarativeError &error, c.errors()) + qWarning() << error.toString(); + return EXIT_IMPORTERROR; + } + } + // find all QMetaObjects reachable from the builtin module QSet<const QMetaObject *> defaultReachable = collectReachableMetaObjects(); QList<QDeclarativeType *> defaultTypes = QDeclarativeMetaType::qmlTypes(); diff --git a/tools/qmlplugindump/qmlplugindump.pro b/tools/qmlplugindump/qmlplugindump.pro index 0ac3a70c14..49134a05ab 100644 --- a/tools/qmlplugindump/qmlplugindump.pro +++ b/tools/qmlplugindump/qmlplugindump.pro @@ -2,7 +2,7 @@ TEMPLATE = app CONFIG += qt uic console DESTDIR = $$QT.declarative.bins -QT += declarative declarative-private core-private +QT += declarative declarative-private qtquick1 core-private TARGET = qmlplugindump |