diff options
| author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-01-31 16:52:36 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-03 00:39:18 +0100 |
| commit | 01dc7e2ea476e0e6dcdce2e72979bbc858f4057d (patch) | |
| tree | d8796f7695bbf8ad42abf47cd84c1b5e000ef795 /tools/qmlplugindump | |
| parent | 5e07b57b818326da47a46d384415041fa4cea0ba (diff) | |
Remove QtQuick1 elements from qtdeclarative
QtQuick1 is now contained in a separate repository.
Task-number: QTBUG-23737
Change-Id: I09eae67af5693a22b896b916f816f73ccc3a89b1
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'tools/qmlplugindump')
| -rw-r--r-- | tools/qmlplugindump/main.cpp | 27 | ||||
| -rw-r--r-- | tools/qmlplugindump/qmlplugindump.pro | 1 |
2 files changed, 2 insertions, 26 deletions
diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp index afbc4a16e2..ad8a3a6d64 100644 --- a/tools/qmlplugindump/main.cpp +++ b/tools/qmlplugindump/main.cpp @@ -45,10 +45,6 @@ #include <QtQuick/private/qquickevents_p_p.h> #include <QtQuick/private/qquickpincharea_p.h> -#ifdef QT_WIDGETS_LIB -#include <QtWidgets/QApplication> -#endif - #include <QtGui/QGuiApplication> #include <QtCore/QDir> #include <QtCore/QFileInfo> @@ -84,8 +80,8 @@ void collectReachableMetaObjects(const QMetaObject *meta, QSet<const QMetaObject if (! meta || metas->contains(meta)) return; - // dynamic meta objects can break things badly (like QDeclarative1VisualDataModelParts) - // but extended types are usually fine (like QDeclarative1GraphicsWidget) + // dynamic meta objects can break things badly + // but extended types are usually fine const QMetaObjectPrivate *mop = reinterpret_cast<const QMetaObjectPrivate *>(meta->d.data); if (extended || !(mop->flags & DynamicMetaObject)) metas->insert(meta); @@ -611,11 +607,7 @@ int main(int argc, char *argv[]) QtSimulatorPrivate::SimulatorConnection::createStubInstance(); #endif -#ifdef QT_WIDGETS_LIB - QApplication app(argc, argv); -#else QGuiApplication app(argc, argv); -#endif const QStringList args = app.arguments(); const QString appName = QFileInfo(app.applicationFilePath()).baseName(); if (args.size() < 2) { @@ -687,21 +679,6 @@ int main(int argc, char *argv[]) engine.addImportPath(pluginImportPath); } -#ifdef QT_WIDGETS_LIB - // 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; - } - } -#endif - // load the QtQuick 2 plugin { QByteArray code("import QtQuick 2.0\nQtObject {}"); diff --git a/tools/qmlplugindump/qmlplugindump.pro b/tools/qmlplugindump/qmlplugindump.pro index 25c0037129..e1c8485e27 100644 --- a/tools/qmlplugindump/qmlplugindump.pro +++ b/tools/qmlplugindump/qmlplugindump.pro @@ -3,7 +3,6 @@ CONFIG += qt uic console DESTDIR = $$QT.declarative.bins QT += declarative declarative-private quick-private core-private -!isEmpty(QT.widgets.name):!isEmpty(QT.qtquick1.name): QT += widgets qtquick1 TARGET = qmlplugindump |