diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2012-12-03 15:54:29 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-03 16:15:59 +0100 |
| commit | a49eca57a27449623318b55abe47a82df44679cb (patch) | |
| tree | 0f96502f623fee532764c33a936ad83ae43520a4 /src | |
| parent | a992b5810f59429418a8134941a53e29966e063f (diff) | |
Fix build of the Designer QAxWidget plugin.
Change-Id: I8a1e08c627f7697ca4449f0c33b1ecbda08257b4
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/designer/src/plugins/activeqt/activeqt.pro | 7 | ||||
| -rw-r--r-- | src/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp | 1 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/designer/src/plugins/activeqt/activeqt.pro b/src/designer/src/plugins/activeqt/activeqt.pro index a94b67105..80837c3e5 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 ed30636ca..0ba35ac43 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> |