qmlplugindump: Load QtQuick 1 plugin.
This allows the QtQuick1 types to be dumped with --builtin and to be skipped when dumping other plugins that use them. Change-Id: I23ecba5cea7c11e998861746f1c7056e8911abf3 Reviewed-on: http://codereview.qt.nokia.com/3650 Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
This commit is contained in:
parent
b016460dc4
commit
438639f9c4
|
@ -540,6 +540,19 @@ int main(int argc, char *argv[])
|
||||||
engine.addImportPath(pluginImportPath);
|
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
|
// find all QMetaObjects reachable from the builtin module
|
||||||
QSet<const QMetaObject *> defaultReachable = collectReachableMetaObjects();
|
QSet<const QMetaObject *> defaultReachable = collectReachableMetaObjects();
|
||||||
QList<QDeclarativeType *> defaultTypes = QDeclarativeMetaType::qmlTypes();
|
QList<QDeclarativeType *> defaultTypes = QDeclarativeMetaType::qmlTypes();
|
||||||
|
|
|
@ -2,7 +2,7 @@ TEMPLATE = app
|
||||||
CONFIG += qt uic console
|
CONFIG += qt uic console
|
||||||
DESTDIR = $$QT.declarative.bins
|
DESTDIR = $$QT.declarative.bins
|
||||||
|
|
||||||
QT += declarative declarative-private core-private
|
QT += declarative declarative-private qtquick1 core-private
|
||||||
|
|
||||||
TARGET = qmlplugindump
|
TARGET = qmlplugindump
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue