diff options
| author | Tim Blechmann <tim@klingt.org> | 2024-02-09 12:11:55 +0800 |
|---|---|---|
| committer | Tim Blechmann <tim@klingt.org> | 2024-03-02 14:13:46 +0800 |
| commit | 5a85b92dd3f5bc0b7f0a753986d23a944fe2ab24 (patch) | |
| tree | 377b612da95f19d5b3d6f928f11a1519a856cd2d /src | |
| parent | 6e7fa22d4599484746c91b3e0f5fe2c3332a11e2 (diff) | |
quick: positioners - make quickpositioners unity buildable
qquickpositioners.cpp's watchedChanges clashed with qquickloader.cpp.
reanming to resolve the name clash
Change-Id: I794469b76d16f65b31949f8c5291df09a5365944
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/quick/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/quick/items/qquickpositioners.cpp | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/quick/CMakeLists.txt b/src/quick/CMakeLists.txt index 097918a3cf..74ae42ad4c 100644 --- a/src/quick/CMakeLists.txt +++ b/src/quick/CMakeLists.txt @@ -646,8 +646,6 @@ qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_positioners SOURCES items/qquickpositioners.cpp items/qquickpositioners_p.h items/qquickpositioners_p_p.h - NO_UNITY_BUILD_SOURCES - items/qquickpositioners.cpp # redefinition of 'watchedChanges' (from qquickloader.cpp) ) qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_flipable diff --git a/src/quick/items/qquickpositioners.cpp b/src/quick/items/qquickpositioners.cpp index b0187e2ff5..ad5447df6f 100644 --- a/src/quick/items/qquickpositioners.cpp +++ b/src/quick/items/qquickpositioners.cpp @@ -12,7 +12,7 @@ QT_BEGIN_NAMESPACE -static const QQuickItemPrivate::ChangeTypes watchedChanges +static const QQuickItemPrivate::ChangeTypes positionerWatchedChanges = QQuickItemPrivate::Geometry | QQuickItemPrivate::SiblingOrder | QQuickItemPrivate::Visibility @@ -21,13 +21,13 @@ static const QQuickItemPrivate::ChangeTypes watchedChanges void QQuickBasePositionerPrivate::watchChanges(QQuickItem *other) { QQuickItemPrivate *otherPrivate = QQuickItemPrivate::get(other); - otherPrivate->addItemChangeListener(this, watchedChanges); + otherPrivate->addItemChangeListener(this, positionerWatchedChanges); } void QQuickBasePositionerPrivate::unwatchChanges(QQuickItem* other) { QQuickItemPrivate *otherPrivate = QQuickItemPrivate::get(other); - otherPrivate->removeItemChangeListener(this, watchedChanges); + otherPrivate->removeItemChangeListener(this, positionerWatchedChanges); } |