summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@digia.com>2012-11-26 15:31:10 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-27 14:22:26 +0100
commited0616b199dde58c8c87097dce31128dd0bfb5b8 (patch)
treecbba2576b3f52c43e7f52ae68d77c73c5a7d97ab
parentd0a744adea8d213d00f248ac04fb18e5baed53a2 (diff)
Qml1PluginDump: Fix dumping of GUI types
Make sure that Gui types are dumped to for -builtins. For QGuiApplication / type() == QApplication::Tty they weren't registered otherwise (change e5b200fa06e). Task-number: QTBUG-28206 Change-Id: Ia6c0902f465ece5411a37b9c23b390172dc58f4b Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
-rw-r--r--tools/qmlplugindump/main.cpp4
-rw-r--r--tools/qmlplugindump/qmlplugindump.pro2
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp
index 9b9ca363..ca110dd9 100644
--- a/tools/qmlplugindump/main.cpp
+++ b/tools/qmlplugindump/main.cpp
@@ -45,7 +45,7 @@
#include <QtDeclarative/private/qdeclarativeevents_p_p.h>
#include <QtDeclarative/private/qdeclarativepincharea_p.h>
-#include <QtGui/QGuiApplication>
+#include <QtWidgets/QApplication>
#include <QtCore/QDir>
#include <QtCore/QFileInfo>
#include <QtCore/QSet>
@@ -554,7 +554,7 @@ int main(int argc, char *argv[])
QtSimulatorPrivate::SimulatorConnection::createStubInstance();
#endif
- QGuiApplication app(argc, argv);
+ QApplication app(argc, argv);
const QStringList args = app.arguments();
const QString appName = QFileInfo(app.applicationFilePath()).baseName();
if (args.size() < 2) {
diff --git a/tools/qmlplugindump/qmlplugindump.pro b/tools/qmlplugindump/qmlplugindump.pro
index 071bcb32..55158e13 100644
--- a/tools/qmlplugindump/qmlplugindump.pro
+++ b/tools/qmlplugindump/qmlplugindump.pro
@@ -1,6 +1,6 @@
TARGET = qml1plugindump
-QT += core-private declarative-private
+QT += core-private declarative-private widgets
SOURCES += \
main.cpp \