diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-02-23 18:10:10 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-02-24 10:25:50 +0100 |
| commit | cfe6ac20a7aaac8c4689c3e22f839e6d95886944 (patch) | |
| tree | 7b4de3487a9603c2f7c1ab630f6aab0aadd57034 /examples/widgetbinding | |
| parent | f914137757ad478e125f9d076bdeaef0f8428e8f (diff) | |
Port the Qt bindings examples to the <QtModule/QtClass> convention
This simplifies the shiboken call; the global Qt include directory can
be passed instead of each single QtCore/QtGui/QtWidgets directory.
Pick-to: 6.0
Change-Id: I55a59ad12b0a9596a2c8d9dc7f0b9c041c38665c
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'examples/widgetbinding')
| -rw-r--r-- | examples/widgetbinding/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | examples/widgetbinding/wigglywidget.cpp | 6 | ||||
| -rw-r--r-- | examples/widgetbinding/wigglywidget.h | 4 |
3 files changed, 7 insertions, 10 deletions
diff --git a/examples/widgetbinding/CMakeLists.txt b/examples/widgetbinding/CMakeLists.txt index 76f5bd112..3b6a645ff 100644 --- a/examples/widgetbinding/CMakeLists.txt +++ b/examples/widgetbinding/CMakeLists.txt @@ -116,13 +116,10 @@ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) # =============================== CMake target - wiggly_library =============================== -# Get all relevant Qt include dirs, to pass them on to shiboken. -get_property(QT_CORE_INCLUDE_DIRS TARGET Qt6::Core PROPERTY INTERFACE_INCLUDE_DIRECTORIES) -get_property(QT_GUI_INCLUDE_DIRS TARGET Qt6::Gui PROPERTY INTERFACE_INCLUDE_DIRECTORIES) +# Get the relevant Qt include dirs, to pass them on to shiboken. get_property(QT_WIDGETS_INCLUDE_DIRS TARGET Qt6::Widgets PROPERTY INTERFACE_INCLUDE_DIRECTORIES) -set(QT_INCLUDE_DIRS ${QT_CORE_INCLUDE_DIRS} ${QT_GUI_INCLUDE_DIRS} ${QT_WIDGETS_INCLUDE_DIRS}) set(INCLUDES "") -foreach(INCLUDE_DIR ${QT_INCLUDE_DIRS}) +foreach(INCLUDE_DIR ${QT_WIDGETS_INCLUDE_DIRS}) list(APPEND INCLUDES "-I${INCLUDE_DIR}") endforeach() diff --git a/examples/widgetbinding/wigglywidget.cpp b/examples/widgetbinding/wigglywidget.cpp index 6d865d190..01a49b1ef 100644 --- a/examples/widgetbinding/wigglywidget.cpp +++ b/examples/widgetbinding/wigglywidget.cpp @@ -50,9 +50,9 @@ #include "wigglywidget.h" -#include <QFontMetrics> -#include <QPainter> -#include <QTimerEvent> +#include <QtGui/QFontMetrics> +#include <QtGui/QPainter> +#include <QtCore/QTimerEvent> //! [0] WigglyWidget::WigglyWidget(QWidget *parent) diff --git a/examples/widgetbinding/wigglywidget.h b/examples/widgetbinding/wigglywidget.h index f5db0fbba..5bfb4da14 100644 --- a/examples/widgetbinding/wigglywidget.h +++ b/examples/widgetbinding/wigglywidget.h @@ -53,8 +53,8 @@ #include "macros.h" -#include <QWidget> -#include <QBasicTimer> +#include <QtWidgets/QWidget> +#include <QtCore/QBasicTimer> //! [0] class BINDINGS_API WigglyWidget : public QWidget |