From 42aad1fd75fa81c63b555adbb210432d569264bf Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Tue, 9 Oct 2012 15:57:35 +0200 Subject: [PATCH] QmlDesigner.NodeInstances: Fix compiling Change-Id: Ica08aaadca52bb416346d871bc9555fb450654f6 Reviewed-by: Thomas Hartmann --- .../qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp | 1 - share/qtcreator/qml/qmlpuppet/qml2puppet/main.cpp | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp index a9d7793015d..44ee4207c0c 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp @@ -33,7 +33,6 @@ #include -#include #include #include #include diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/main.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/main.cpp index 63844a34c93..a88f612aa4d 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/main.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/main.cpp @@ -29,7 +29,7 @@ #include -#include +#include #include #include @@ -44,7 +44,7 @@ int main(int argc, char *argv[]) { - QApplication application(argc, argv); + QGuiApplication application(argc, argv); QCoreApplication::setOrganizationName("QtProject"); QCoreApplication::setOrganizationDomain("qt-project.org");