diff options
author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-03-30 10:21:55 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-04-01 13:06:21 +0200 |
commit | 37d19e4b5eda47c145eeeac884d0b558acddb19d (patch) | |
tree | 17ec257fd6ca989f6f497c75d4f37a1bc88883c7 /tests/manual | |
parent | 7f6d41e35091594cb2371b4b2991f5a04e483539 (diff) | |
download | qtactiveqt-37d19e4b5eda47c145eeeac884d0b558acddb19d.tar.gz |
Update include for QAction after move from widgets to gui in qtbase
- Fix include for QAction after move from widgets to gui in qtbase
- Adapt to OpenGL split
- Skip dumpcpp test for the moment
Change-Id: I8fcec00c56158ee427a9f374b07bb814a99d3bce
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'tests/manual')
-rw-r--r-- | tests/manual/axviewer/main.cpp | 2 | ||||
-rw-r--r-- | tests/manual/testcontrol/main.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/manual/axviewer/main.cpp b/tests/manual/axviewer/main.cpp index 4828009..138dfed 100644 --- a/tests/manual/axviewer/main.cpp +++ b/tests/manual/axviewer/main.cpp @@ -29,7 +29,7 @@ #include <ActiveQt/QAxSelect> #include <ActiveQt/QAxWidget> -#include <QtWidgets/QAction> +#include <QtGui/QAction> #include <QtWidgets/QApplication> #include <QtWidgets/QDialog> #include <QtWidgets/QDialogButtonBox> diff --git a/tests/manual/testcontrol/main.cpp b/tests/manual/testcontrol/main.cpp index 7fca250..46dfa6b 100644 --- a/tests/manual/testcontrol/main.cpp +++ b/tests/manual/testcontrol/main.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ #include <ActiveQt/QAxFactory> -#include <QtWidgets/QAction> +#include <QtGui/QAction> #include <QtWidgets/QApplication> #include <QtWidgets/QMainWindow> #include <QtWidgets/QMenu> |