diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-05-13 11:35:47 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-05-13 22:34:11 +0200 |
| commit | 495b7e2a18433a152601d1438790957c77d2ae6e (patch) | |
| tree | 9afeaada6790d762919bbbbf6762210522b4d420 /src/designer/src/plugins | |
| parent | 5f4ed04d3aaba18437703a09d5091afbcb8c6280 (diff) | |
Qt Designer/Active Qt plugin: Fix build (qmake)
Remove unneeded private header.
Adapt headers to new structure.
Change-Id: I04dfd85718b532e040d403a525b970f098a87ace
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/designer/src/plugins')
| -rw-r--r-- | src/designer/src/plugins/activeqt/qaxwidgetplugin.cpp | 2 | ||||
| -rw-r--r-- | src/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp | 3 | ||||
| -rw-r--r-- | src/designer/src/plugins/activeqt/qdesigneraxwidget.cpp | 3 |
3 files changed, 3 insertions, 5 deletions
diff --git a/src/designer/src/plugins/activeqt/qaxwidgetplugin.cpp b/src/designer/src/plugins/activeqt/qaxwidgetplugin.cpp index a29ba2f77..67b51c3aa 100644 --- a/src/designer/src/plugins/activeqt/qaxwidgetplugin.cpp +++ b/src/designer/src/plugins/activeqt/qaxwidgetplugin.cpp @@ -37,7 +37,7 @@ #include <QtCore/qplugin.h> #include <QtGui/qicon.h> -#include <ActiveQt/QAxWidget> +#include <QtAxContainer/QAxWidget> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp b/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp index 2f863781b..d512112bd 100644 --- a/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp +++ b/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp @@ -35,8 +35,7 @@ #include <QtDesigner/abstractformeditor.h> #include <QtDesigner/qextensionmanager.h> -#include <ActiveQt/qaxselect.h> -#include <ActiveQt/qaxtypes.h> +#include <QtAxContainer/qaxselect.h> #include <QtWidgets/qmessagebox.h> #include <QtGui/qundostack.h> diff --git a/src/designer/src/plugins/activeqt/qdesigneraxwidget.cpp b/src/designer/src/plugins/activeqt/qdesigneraxwidget.cpp index 9ce14ed81..afe18f417 100644 --- a/src/designer/src/plugins/activeqt/qdesigneraxwidget.cpp +++ b/src/designer/src/plugins/activeqt/qdesigneraxwidget.cpp @@ -34,11 +34,10 @@ #include <QtGui/qpainter.h> #include <QtGui/qevent.h> -#include <ActiveQt/QAxWidget> +#include <QtAxContainer/QAxWidget> #include <qt_windows.h> #include <olectl.h> -#include <qaxtypes.h> enum { debugAxWidget = 0 }; |