diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-02-23 18:10:10 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-02-24 10:52:54 +0000 |
| commit | b6ad8d71536f018652675ecb22d5e12fe8d1f25d (patch) | |
| tree | ac4ddd185652e7506db12a6218fea62bd07dce60 | |
| parent | 85b758577e6a0ab1df015785aafe966fc58a6b36 (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.
Change-Id: I55a59ad12b0a9596a2c8d9dc7f0b9c041c38665c
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
(cherry picked from commit cfe6ac20a7aaac8c4689c3e22f839e6d95886944)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | examples/scriptableapplication/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | examples/widgetbinding/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | examples/widgetbinding/wigglywidget.cpp | 6 | ||||
| -rw-r--r-- | examples/widgetbinding/wigglywidget.h | 4 |
4 files changed, 8 insertions, 14 deletions
diff --git a/examples/scriptableapplication/CMakeLists.txt b/examples/scriptableapplication/CMakeLists.txt index a67025c62..9e306cdd4 100644 --- a/examples/scriptableapplication/CMakeLists.txt +++ b/examples/scriptableapplication/CMakeLists.txt @@ -65,12 +65,9 @@ endif() # 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_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/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 ab549ef07..3d90773c6 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 d08db05d5..21fc912c5 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 |