diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-10-03 13:47:19 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-10-03 13:47:19 +0300 |
| commit | 8a5f6c7f81eef21db425038b213e84dd25ed336d (patch) | |
| tree | d3bb5fa3079fb7a35e641164941b70c435e1d48b /examples | |
| parent | 4ad98906e9931b50a51080a7880951a173c4c3f9 (diff) | |
| parent | 938cdd2629732988bb815b5ceb14dab4563311d7 (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-6.2.7' into tqtc/lts-6.2-opensource
Change-Id: Ie70d33341cccaaa69968dc8d1337ec27d7895127
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/corelib/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | examples/widgets/animation/easing/animation.h | 4 | ||||
| -rw-r--r-- | examples/widgets/animation/easing/window.cpp | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/examples/corelib/CMakeLists.txt b/examples/corelib/CMakeLists.txt index 30e2c8cd1f..0a155606e5 100644 --- a/examples/corelib/CMakeLists.txt +++ b/examples/corelib/CMakeLists.txt @@ -1,6 +1,5 @@ # Generated from corelib.pro. -add_subdirectory(bindableproperties) add_subdirectory(ipc) add_subdirectory(mimetypes) add_subdirectory(serialization) @@ -9,3 +8,6 @@ add_subdirectory(platform) if(QT_FEATURE_thread) add_subdirectory(threads) endif() +if(QT_FEATURE_widgets) + add_subdirectory(bindableproperties) +endif() diff --git a/examples/widgets/animation/easing/animation.h b/examples/widgets/animation/easing/animation.h index 696257bb4a..d78997d5ff 100644 --- a/examples/widgets/animation/easing/animation.h +++ b/examples/widgets/animation/easing/animation.h @@ -62,8 +62,8 @@ public: CirclePath, NPathTypes }; - Animation(QObject *target, const QByteArray &prop) - : QPropertyAnimation(target, prop) + Animation(QObject *target, const QByteArray &prop, QObject *parent = nullptr) + : QPropertyAnimation(target, prop, parent) { setPathType(LinearPath); } diff --git a/examples/widgets/animation/easing/window.cpp b/examples/widgets/animation/easing/window.cpp index 7b4fe1d912..d0deb843e4 100644 --- a/examples/widgets/animation/easing/window.cpp +++ b/examples/widgets/animation/easing/window.cpp @@ -82,7 +82,7 @@ Window::Window(QWidget *parent) m_scene.addItem(m_item); m_ui.graphicsView->setScene(&m_scene); - m_anim = new Animation(m_item, "pos"); + m_anim = new Animation(m_item, "pos", this); m_anim->setEasingCurve(QEasingCurve::OutBounce); m_ui.easingCurvePicker->setCurrentRow(int(QEasingCurve::OutBounce)); |