From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Mon, 3 Dec 2012 14:54:29 +0000 (+0100)
Subject: Fix build of the Designer QAxWidget plugin.
X-Git-Tag: accepted/tizen/20131212.181521~128^2~71
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a49eca57a27449623318b55abe47a82df44679cb;p=platform%2Fupstream%2Fqttools.git

Fix build of the Designer QAxWidget plugin.

Change-Id: I8a1e08c627f7697ca4449f0c33b1ecbda08257b4
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
---

diff --git a/src/designer/src/plugins/activeqt/activeqt.pro b/src/designer/src/plugins/activeqt/activeqt.pro
index a94b671..80837c3 100644
--- a/src/designer/src/plugins/activeqt/activeqt.pro
+++ b/src/designer/src/plugins/activeqt/activeqt.pro
@@ -1,6 +1,5 @@
 TARGET      = qaxwidget
-CONFIG     += qaxcontainer
-QT         += widgets designer-private
+QT         += widgets designer-private axcontainer
 
 include(../plugins.pri)
 
@@ -14,13 +13,13 @@ qaxwidgetplugin.cpp \
 qdesigneraxwidget.cpp \
 qaxwidgetpropertysheet.cpp \
 qaxwidgettaskmenu.cpp \
-    $$QT.activeqt.sources/shared/qaxtypes.cpp
+    $$QT.axcontainer.sources/../shared/qaxtypes.cpp
 
 HEADERS += qaxwidgetextrainfo.h \
 qaxwidgetplugin.h \
 qdesigneraxwidget.h \
 qaxwidgetpropertysheet.h \
 qaxwidgettaskmenu.h \
-    $$QT.activeqt.sources/shared/qaxtypes.h
+    $$QT.axcontainer.sources/../shared/qaxtypes.h
 
 OTHER_FILES += activeqt.json
diff --git a/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp b/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp
index ed30636..0ba35ac 100644
--- a/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp
+++ b/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp
@@ -51,6 +51,7 @@
 #include <QtWidgets/QUndoCommand>
 #include <QtWidgets/QMessageBox>
 #include <QtWidgets/QUndoStack>
+#include <QtWidgets/QAction>
 #include <QtCore/QUuid>
 #include <ActiveQt/qaxselect.h>