Skip to content

Calls order of q_invokable method #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
rjcamatos wants to merge 10,000 commits into
base: 6.2
Choose a base branch
from
Open

Calls order of q_invokable method #10

rjcamatos wants to merge 10,000 commits into from

Conversation

@rjcamatos
Copy link

@rjcamatos rjcamatos commented Jul 11, 2021

If there are 2 or more methods with the same name but reciving diferent arguments the QJSEngine Pickup the First One declared.

Example:
methodxyz(string)
methodxyz(objptr*)

It picks up the first one passing as argument a string and not the one that i was expecting an object as it was send.

qtprojectorg pushed a commit that referenced this pull request Dec 8, 2023
@michaelweghorn
QmltcVisitor: Fix sort order of array used with std::binary_search
62d870d 
Using std::binary_search has the requirement that the passed
range fulfils ordering requirements, which was not the case
for the cppKeywords array here.

As the QString doc says [1]:

> QStrings can be compared using overloaded operators such as operator<(),
> operator<=(), operator==(), operator>=(), and so on. Note that
> the comparison is based exclusively on the numeric Unicode
> values of the characters. It is very fast, but is not what a
> human would expect; (...)

Therefore, sort the array accordingly and add an assert to
ensure it will remain sorted.

Fixes an crash/assert when building qtdeclarative with
CXXFLAGS='-D_GLIBCXX_DEBUG':

    /usr/include/c++/13/bits/stl_algo.h:2243:
    In function:
        bool std::binary_search(_FIter, _FIter, const _Tp&) [with _FIter = const
        QString*; _Tp = QStringView]

    Error: elements in iterator range [first, last) are not partitioned by the
    value __val.

    Objects involved in the operation:
        iterator "first" @ 0x7ffc4a2c4f18 {
          type = QString const* (constant iterator);
        }
        iterator "last" @ 0x7ffc4a2c4f10 {
          type = QString const* (constant iterator);
        }
    Aborted (core dumped)
    ninja: build stopped: subcommand failed.

GDB backtrace:

    Program terminated with signal SIGABRT, Aborted.
    #0  __pthread_kill_implementation (threadid=<optimized out>, signo=signo@entry=6, no_tid=no_tid@entry=0) at ./nptl/pthread_kill.c:44
    44      ./nptl/pthread_kill.c: No such file or directory.
    (gdb) bt
    #0  __pthread_kill_implementation (threadid=<optimized out>, signo=signo@entry=6, no_tid=no_tid@entry=0) at ./nptl/pthread_kill.c:44
    #1  0x00007f307e0a815f in __pthread_kill_internal (signo=6, threadid=<optimized out>) at ./nptl/pthread_kill.c:78
    #2  0x00007f307e05a472 in __GI_raise (sig=sig@entry=6) at ../sysdeps/posix/raise.c:26
    #3  0x00007f307e0444b2 in __GI_abort () at ./stdlib/abort.c:79
    #4  0x00007f307e2a300d in ?? () from /lib/x86_64-linux-gnu/libstdc++.so.6
    #5  0x00005639ff90471d in std::binary_search<QString const*, QStringView> (__first=0x5639ffa1a9c0 <QmltcVisitor::checkForNamingCollisionsWithCpp(QDeferredSharedPointer<QQmlJSScope const> const&)::cppKeywords>,
        __last=0x5639ffa1b2c0 <guard variable for QmltcVisitor::checkForNamingCollisionsWithCpp(QDeferredSharedPointer<QQmlJSScope const> const&)::cppKeywords>, __val=...) at /usr/include/c++/13/bits/stl_algo.h:2243
    #6  0x00005639ff8fb837 in operator() (__closure=0x7ffc4a2c52bf, word=...) at /home/michi/development/git/qt5/qtdeclarative/tools/qmltc/qmltcvisitor.cpp:764
    #7  0x00005639ff8fb89e in operator() (__closure=0x7ffc4a2c52a0, name=..., errorPrefix=...) at /home/michi/development/git/qt5/qtdeclarative/tools/qmltc/qmltcvisitor.cpp:768
    #8  0x00005639ff8fc99b in QmltcVisitor::checkForNamingCollisionsWithCpp (this=0x7ffc4a2c6070, type=...) at /home/michi/development/git/qt5/qtdeclarative/tools/qmltc/qmltcvisitor.cpp:787
    #9  0x00005639ff8f9dea in QmltcVisitor::endVisit (this=0x7ffc4a2c6070, program=0x563a002e0628) at /home/michi/development/git/qt5/qtdeclarative/tools/qmltc/qmltcvisitor.cpp:341
    #10 0x00007f307f6636fa in QQmlJS::AST::UiProgram::accept0 (this=0x563a002e0628, visitor=0x7ffc4a2c6070) at /home/michi/development/git/qt5/qtdeclarative/src/qml/parser/qqmljsast.cpp:1193
    #11 0x00007f3080159b8f in QQmlJS::AST::Node::accept (this=0x563a002e0628, visitor=0x7ffc4a2c6070)
        at /home/michi/development/git/qt5/qtbase/include/QtQml/6.7.0/QtQml/private/../../../../../../qtdeclarative/src/qml/parser/qqmljsast_p.h:272
    #12 0x00007f3080212f4b in QQmlJSTypeResolver::init (this=0x7ffc4a2c5b50, visitor=0x7ffc4a2c6070, program=0x563a002e0628) at /home/michi/development/git/qt5/qtdeclarative/src/qmlcompiler/qqmljstyperesolver.cpp:173
    #13 0x00005639ff8f0bd3 in QmltcTypeResolver::init (this=0x7ffc4a2c5b50, visitor=0x7ffc4a2c6070, program=0x563a002e0628) at /home/michi/development/git/qt5/qtdeclarative/tools/qmltc/qmltctyperesolver.cpp:19
    #14 0x00005639ff8c02d4 in main (argc=23, argv=0x7ffc4a2c7a68) at /home/michi/development/git/qt5/qtdeclarative/tools/qmltc/main.cpp:269

[1] https://doc.qt.io/qt-6/qstring.html#comparing-strings

Change-Id: I82ebbcdca4ab90155b935f9af24b3a3821134563
Reviewed-by: Sami Shalayel <[email protected]>
Reviewed-by: Ulf Hermann <[email protected]>
@cla-assistant
Copy link

cla-assistant bot commented Nov 15, 2024 •
edited
Loading

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
1 out of 13 committers have signed the CLA.

✅ EvenOAndersen
❌ vohi
❌ ulfhermannqt
❌ Richard Moe Gustavsen
❌ dilekakcaay
❌ qtrampe
❌ jaheikk
❌ timblechmann
❌ eskilblomfeldt
❌ samishalayel
❌ mitchcurtis
❌ Morteza-Jamshidi
❌ dorisverria1

Richard Moe Gustavsen seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account.
You have signed the CLA already but the status is still pending? Let us recheck it.

qtprojectorg pushed a commit that referenced this pull request Sep 9, 2025
@mitchcurtis
tst_QQuickPopup::fadeDimmer: fix stack-use-after-scope
f8742ca 
Use dimmer as a context object rather than the test itself, which
outlives it.

The backtrace was:

    FAIL!  : tst_QQuickPopup::Basic::fadeDimmer(modal) The computed value is expected to be greater than the baseline, but is not
       Computed (opacityChangeCount): 2
       Baseline (2)                 : 2
       Loc: [/Users/mitch/dev/qt-dev2/qtdeclarative/tests/auto/quickcontrols/qquickpopup/tst_qquickpopup.cpp(2629)]
    =================================================================
    ==68826==ERROR: AddressSanitizer: stack-use-after-scope on address 0x00016b7f7140 at pc 0x000104743c68 bp 0x00016b7ecfd0 sp 0x00016b7ecfc8
    READ of size 4 at 0x00016b7f7140 thread T0
        #0 0x000104743c64 in tst_QQuickPopup::fadeDimmer()::$_0::operator()() const tst_qquickpopup.cpp:2625
        #1 0x000104743bc0 in QtPrivate::FunctorCall<std::__1::integer_sequence<unsigned long>, QtPrivate::List<>, void, tst_QQuickPopup::fadeDimmer()::$_0>::call(tst_QQuickPopup::fadeDimmer()::$_0&, void**)::'lambda'()::operator()() const qobjectdefs_impl.h:116
        #2 0x000104743b64 in void QtPrivate::FunctorCallBase::call_internal<void, QtPrivate::FunctorCall<std::__1::integer_sequence<unsigned long>, QtPrivate::List<>, void, tst_QQuickPopup::fadeDimmer()::$_0>::call(tst_QQuickPopup::fadeDimmer()::$_0&, void**)::'lambda'()>(void**, QtPrivate::FunctorCall<std::__1::integer_sequence<unsigned long>, QtPrivate::List<>, void, tst_QQuickPopup::fadeDimmer()::$_0>::call(tst_QQuickPopup::fadeDimmer()::$_0&, void**)::'lambda'()&&) qobjectdefs_impl.h:65
        #3 0x000104743ab4 in QtPrivate::FunctorCall<std::__1::integer_sequence<unsigned long>, QtPrivate::List<>, void, tst_QQuickPopup::fadeDimmer()::$_0>::call(tst_QQuickPopup::fadeDimmer()::$_0&, void**) qobjectdefs_impl.h:115
        #4 0x000104743930 in void QtPrivate::FunctorCallable<tst_QQuickPopup::fadeDimmer()::$_0>::call<QtPrivate::List<>, void>(tst_QQuickPopup::fadeDimmer()::$_0&, void*, void**) qobjectdefs_impl.h:337
        #5 0x000104743848 in QtPrivate::QCallableObject<tst_QQuickPopup::fadeDimmer()::$_0, QtPrivate::List<>, void>::impl(int, QtPrivate::QSlotObjectBase*, QObject*, void**, bool*) qobjectdefs_impl.h:547
        #6 0x00011694273c in QtPrivate::QSlotObjectBase::call(QObject*, void**) qobjectdefs_impl.h:461
        #7 0x000116e49454 in void doActivate<false>(QObject*, int, void**) qobject.cpp:4284
        #8 0x000116e467a0 in QMetaObject::activate(QObject*, QMetaObject const*, int, void**) qobject.cpp:4344
        #9 0x00010c1462d4 in QQuickItem::opacityChanged() moc_qquickitem.cpp:1019
        #10 0x00010c1461c8 in QQuickItem::setOpacity(double) qquickitem.cpp:6517
        #11 0x00010c168638 in QQuickItem::qt_static_metacall(QObject*, QMetaObject::Call, int, void**) moc_qquickitem.cpp:850
        #12 0x000113847100 in QQmlPropertyData::writeProperty(QObject*, void*, QFlags<QQmlPropertyData::WriteFlag>) const qqmlpropertydata_p.h:413
        #13 0x000113c33468 in QQmlPropertyPrivate::write(QObject*, QQmlPropertyData const&, QVariant const&, QQmlRefPointer<QQmlContextData> const&, QFlags<QQmlPropertyData::WriteFlag>) qqmlproperty.cpp:1668
        #14 0x000113c32638 in QQmlPropertyPrivate::writeValueProperty(QObject*, QQmlPropertyData const&, QQmlPropertyData const&, QVariant const&, QQmlRefPointer<QQmlContextData> const&, QFlags<QQmlPropertyData::WriteFlag>) qqmlproperty.cpp:1326
        #15 0x000113c32390 in QQmlPropertyPrivate::writeValueProperty(QVariant const&, QFlags<QQmlPropertyData::WriteFlag>) qqmlproperty.cpp:1270
        #16 0x000113c391b4 in QQmlPropertyPrivate::write(QQmlProperty const&, QVariant const&, QFlags<QQmlPropertyData::WriteFlag>) qqmlproperty.cpp:1947
        #17 0x00010c9949ac in QQuickAnimationPropertyUpdater::setValue(double) qquickanimation.cpp:2740
        #18 0x00010c992444 in QQuickBulkValueAnimator::updateCurrentTime(int) qquickanimation.cpp:2069
        #19 0x000114345428 in QAbstractAnimationJob::setCurrentTime(int) qabstractanimationjob.cpp:481
        #20 0x000114349c3c in QAbstractAnimationJob::setState(QAbstractAnimationJob::State) qabstractanimationjob.cpp:367
        #21 0x00011434bc34 in QAbstractAnimationJob::start() qabstractanimationjob.cpp:514
        #22 0x00010c9ff568 in QQuickBehavior::write(QVariant const&) qquickbehavior.cpp:419
        #23 0x00010c9ff88c in non-virtual thunk to QQuickBehavior::write(QVariant const&) qquickbehavior.cpp
        #24 0x000113f53b7c in QQmlInterceptorMetaObject::doIntercept(QMetaObject::Call, int, void**) qqmlvmemetaobject.cpp:392
        #25 0x000113f532e4 in QQmlInterceptorMetaObject::intercept(QMetaObject::Call, int, void**) qqmlvmemetaobject_p.h:153
        #26 0x000113f59788 in QQmlVMEMetaObject::metaCall(QObject*, QMetaObject::Call, int, void**) qqmlvmemetaobject.cpp:750
        #27 0x0001138474d0 in void QQmlPropertyData::doMetacall<(QMetaObject::Call)2>(QObject*, int, void**) const qqmlpropertydata_p.h:395
        #28 0x000113847128 in QQmlPropertyData::writeProperty(QObject*, void*, QFlags<QQmlPropertyData::WriteFlag>) const qqmlpropertydata_p.h:415
        #29 0x000113c33468 in QQmlPropertyPrivate::write(QObject*, QQmlPropertyData const&, QVariant const&, QQmlRefPointer<QQmlContextData> const&, QFlags<QQmlPropertyData::WriteFlag>) qqmlproperty.cpp:1668
        #30 0x000113c32638 in QQmlPropertyPrivate::writeValueProperty(QObject*, QQmlPropertyData const&, QQmlPropertyData const&, QVariant const&, QQmlRefPointer<QQmlContextData> const&, QFlags<QQmlPropertyData::WriteFlag>) qqmlproperty.cpp:1326
        #31 0x000113c32390 in QQmlPropertyPrivate::writeValueProperty(QVariant const&, QFlags<QQmlPropertyData::WriteFlag>) qqmlproperty.cpp:1270
        #32 0x000113c391b4 in QQmlPropertyPrivate::write(QQmlProperty const&, QVariant const&, QFlags<QQmlPropertyData::WriteFlag>) qqmlproperty.cpp:1947
        #33 0x000113c38f84 in QQmlProperty::write(QVariant const&) const qqmlproperty.cpp:1863
        #34 0x000113c39358 in QQmlProperty::write(QObject*, QString const&, QVariant const&) qqmlproperty.cpp:1880
        #35 0x000107c1db04 in QQuickPopupPrivate::hideDimmer() qquickpopup.cpp:1290
        #36 0x000107c16a68 in QQuickPopupPrivate::prepareExitTransition() qquickpopup.cpp:821
        #37 0x000107c1e038 in QQuickPopupTransitionManager::transitionExit() qquickpopup.cpp:1326
        #38 0x000107c23fd4 in QQuickPopup::setVisible(bool) qquickpopup.cpp:2496
        #39 0x000107c104d8 in QQuickPopup::close() qquickpopup.cpp:1408
        #40 0x000107c1ba80 in QQuickPopup::setParentItem(QQuickItem*) qquickpopup.cpp:2180
        #41 0x000107c1b324 in QQuickPopupPrivate::itemDestroyed(QQuickItem*) qquickpopup.cpp:1063
        #42 0x000107c1bb8c in non-virtual thunk to QQuickPopupPrivate::itemDestroyed(QQuickItem*) qquickpopup.cpp
        #43 0x00010c117f70 in void QQuickItemPrivate::notifyChangeListeners<void (QQuickItemChangeListener::*)(QQuickItem*), QQuickItem*>(QFlags<QQuickItemPrivate::ChangeType>, void (QQuickItemChangeListener::*&&)(QQuickItem*), QQuickItem*&&) qquickitem_p.h:413
        #44 0x00010c113d7c in QQuickItem::~QQuickItem() qquickitem.cpp:2420
        #45 0x00010c50e3e8 in QQuickRootItem::~QQuickRootItem() qquickwindow_p.h:62
        #46 0x00010c4ed840 in QQuickRootItem::~QQuickRootItem() qquickwindow_p.h:62
        #47 0x00010c4ed86c in QQuickRootItem::~QQuickRootItem() qquickwindow_p.h:62
        #48 0x00010c4da1c0 in QQuickWindow::~QQuickWindow() qquickwindow.cpp:1197
        #49 0x00010c531f34 in QQuickWindowQmlImpl::~QQuickWindowQmlImpl() qquickwindowmodule.cpp:73
        #50 0x00010cf2d4f4 in QQmlPrivate::QQmlElement<QQuickWindowQmlImpl>::~QQmlElement() qqmlprivate.h:104
        #51 0x00010cf2d3e0 in QQmlPrivate::QQmlElement<QQuickWindowQmlImpl>::~QQmlElement() qqmlprivate.h:102
        #52 0x00010cf2d40c in QQmlPrivate::QQmlElement<QQuickWindowQmlImpl>::~QQmlElement() qqmlprivate.h:102
        #53 0x00010472efa8 in QScopedPointerDeleter<QObject>::cleanup(QObject*) qscopedpointer.h:24
        #54 0x00010472eefc in QScopedPointer<QObject, QScopedPointerDeleter<QObject>>::~QScopedPointer() qscopedpointer.h:81
        #55 0x00010466f0e8 in QScopedPointer<QObject, QScopedPointerDeleter<QObject>>::~QScopedPointer() qscopedpointer.h:79
        #56 0x00010471246c in QQuickVisualTestUtils::QQuickApplicationHelper::~QQuickApplicationHelper() visualtestutils_p.h:192
        #57 0x00010468ff88 in QQuickVisualTestUtils::QQuickApplicationHelper::~QQuickApplicationHelper() visualtestutils_p.h:192
        #58 0x0001046a953c in tst_QQuickPopup::fadeDimmer() tst_qquickpopup.cpp:2635
        [...]

Amends ef8bde8.

Pick-to: 6.8 6.9 6.10
Change-Id: Ie5c49b7d9ecd3c74f822590d296062b516563391
Reviewed-by: Volker Hilsheimer <[email protected]>
qtprojectorg pushed a commit that referenced this pull request Sep 12, 2025
@mitchcurtis
tst_QQuickPopup::fadeDimmer: fix stack-use-after-scope
cc726a4 
Use dimmer as a context object rather than the test itself, which
outlives it.

The backtrace was:

    FAIL!  : tst_QQuickPopup::Basic::fadeDimmer(modal) The computed value is expected to be greater than the baseline, but is not
       Computed (opacityChangeCount): 2
       Baseline (2)                 : 2
       Loc: [/Users/mitch/dev/qt-dev2/qtdeclarative/tests/auto/quickcontrols/qquickpopup/tst_qquickpopup.cpp(2629)]
    =================================================================
    ==68826==ERROR: AddressSanitizer: stack-use-after-scope on address 0x00016b7f7140 at pc 0x000104743c68 bp 0x00016b7ecfd0 sp 0x00016b7ecfc8
    READ of size 4 at 0x00016b7f7140 thread T0
        #0 0x000104743c64 in tst_QQuickPopup::fadeDimmer()::$_0::operator()() const tst_qquickpopup.cpp:2625
        #1 0x000104743bc0 in QtPrivate::FunctorCall<std::__1::integer_sequence<unsigned long>, QtPrivate::List<>, void, tst_QQuickPopup::fadeDimmer()::$_0>::call(tst_QQuickPopup::fadeDimmer()::$_0&, void**)::'lambda'()::operator()() const qobjectdefs_impl.h:116
        #2 0x000104743b64 in void QtPrivate::FunctorCallBase::call_internal<void, QtPrivate::FunctorCall<std::__1::integer_sequence<unsigned long>, QtPrivate::List<>, void, tst_QQuickPopup::fadeDimmer()::$_0>::call(tst_QQuickPopup::fadeDimmer()::$_0&, void**)::'lambda'()>(void**, QtPrivate::FunctorCall<std::__1::integer_sequence<unsigned long>, QtPrivate::List<>, void, tst_QQuickPopup::fadeDimmer()::$_0>::call(tst_QQuickPopup::fadeDimmer()::$_0&, void**)::'lambda'()&&) qobjectdefs_impl.h:65
        #3 0x000104743ab4 in QtPrivate::FunctorCall<std::__1::integer_sequence<unsigned long>, QtPrivate::List<>, void, tst_QQuickPopup::fadeDimmer()::$_0>::call(tst_QQuickPopup::fadeDimmer()::$_0&, void**) qobjectdefs_impl.h:115
        #4 0x000104743930 in void QtPrivate::FunctorCallable<tst_QQuickPopup::fadeDimmer()::$_0>::call<QtPrivate::List<>, void>(tst_QQuickPopup::fadeDimmer()::$_0&, void*, void**) qobjectdefs_impl.h:337
        #5 0x000104743848 in QtPrivate::QCallableObject<tst_QQuickPopup::fadeDimmer()::$_0, QtPrivate::List<>, void>::impl(int, QtPrivate::QSlotObjectBase*, QObject*, void**, bool*) qobjectdefs_impl.h:547
        #6 0x00011694273c in QtPrivate::QSlotObjectBase::call(QObject*, void**) qobjectdefs_impl.h:461
        #7 0x000116e49454 in void doActivate<false>(QObject*, int, void**) qobject.cpp:4284
        #8 0x000116e467a0 in QMetaObject::activate(QObject*, QMetaObject const*, int, void**) qobject.cpp:4344
        #9 0x00010c1462d4 in QQuickItem::opacityChanged() moc_qquickitem.cpp:1019
        #10 0x00010c1461c8 in QQuickItem::setOpacity(double) qquickitem.cpp:6517
        #11 0x00010c168638 in QQuickItem::qt_static_metacall(QObject*, QMetaObject::Call, int, void**) moc_qquickitem.cpp:850
        #12 0x000113847100 in QQmlPropertyData::writeProperty(QObject*, void*, QFlags<QQmlPropertyData::WriteFlag>) const qqmlpropertydata_p.h:413
        #13 0x000113c33468 in QQmlPropertyPrivate::write(QObject*, QQmlPropertyData const&, QVariant const&, QQmlRefPointer<QQmlContextData> const&, QFlags<QQmlPropertyData::WriteFlag>) qqmlproperty.cpp:1668
        #14 0x000113c32638 in QQmlPropertyPrivate::writeValueProperty(QObject*, QQmlPropertyData const&, QQmlPropertyData const&, QVariant const&, QQmlRefPointer<QQmlContextData> const&, QFlags<QQmlPropertyData::WriteFlag>) qqmlproperty.cpp:1326
        #15 0x000113c32390 in QQmlPropertyPrivate::writeValueProperty(QVariant const&, QFlags<QQmlPropertyData::WriteFlag>) qqmlproperty.cpp:1270
        #16 0x000113c391b4 in QQmlPropertyPrivate::write(QQmlProperty const&, QVariant const&, QFlags<QQmlPropertyData::WriteFlag>) qqmlproperty.cpp:1947
        #17 0x00010c9949ac in QQuickAnimationPropertyUpdater::setValue(double) qquickanimation.cpp:2740
        #18 0x00010c992444 in QQuickBulkValueAnimator::updateCurrentTime(int) qquickanimation.cpp:2069
        #19 0x000114345428 in QAbstractAnimationJob::setCurrentTime(int) qabstractanimationjob.cpp:481
        #20 0x000114349c3c in QAbstractAnimationJob::setState(QAbstractAnimationJob::State) qabstractanimationjob.cpp:367
        #21 0x00011434bc34 in QAbstractAnimationJob::start() qabstractanimationjob.cpp:514
        #22 0x00010c9ff568 in QQuickBehavior::write(QVariant const&) qquickbehavior.cpp:419
        #23 0x00010c9ff88c in non-virtual thunk to QQuickBehavior::write(QVariant const&) qquickbehavior.cpp
        #24 0x000113f53b7c in QQmlInterceptorMetaObject::doIntercept(QMetaObject::Call, int, void**) qqmlvmemetaobject.cpp:392
        #25 0x000113f532e4 in QQmlInterceptorMetaObject::intercept(QMetaObject::Call, int, void**) qqmlvmemetaobject_p.h:153
        #26 0x000113f59788 in QQmlVMEMetaObject::metaCall(QObject*, QMetaObject::Call, int, void**) qqmlvmemetaobject.cpp:750
        #27 0x0001138474d0 in void QQmlPropertyData::doMetacall<(QMetaObject::Call)2>(QObject*, int, void**) const qqmlpropertydata_p.h:395
        #28 0x000113847128 in QQmlPropertyData::writeProperty(QObject*, void*, QFlags<QQmlPropertyData::WriteFlag>) const qqmlpropertydata_p.h:415
        #29 0x000113c33468 in QQmlPropertyPrivate::write(QObject*, QQmlPropertyData const&, QVariant const&, QQmlRefPointer<QQmlContextData> const&, QFlags<QQmlPropertyData::WriteFlag>) qqmlproperty.cpp:1668
        #30 0x000113c32638 in QQmlPropertyPrivate::writeValueProperty(QObject*, QQmlPropertyData const&, QQmlPropertyData const&, QVariant const&, QQmlRefPointer<QQmlContextData> const&, QFlags<QQmlPropertyData::WriteFlag>) qqmlproperty.cpp:1326
        #31 0x000113c32390 in QQmlPropertyPrivate::writeValueProperty(QVariant const&, QFlags<QQmlPropertyData::WriteFlag>) qqmlproperty.cpp:1270
        #32 0x000113c391b4 in QQmlPropertyPrivate::write(QQmlProperty const&, QVariant const&, QFlags<QQmlPropertyData::WriteFlag>) qqmlproperty.cpp:1947
        #33 0x000113c38f84 in QQmlProperty::write(QVariant const&) const qqmlproperty.cpp:1863
        #34 0x000113c39358 in QQmlProperty::write(QObject*, QString const&, QVariant const&) qqmlproperty.cpp:1880
        #35 0x000107c1db04 in QQuickPopupPrivate::hideDimmer() qquickpopup.cpp:1290
        #36 0x000107c16a68 in QQuickPopupPrivate::prepareExitTransition() qquickpopup.cpp:821
        #37 0x000107c1e038 in QQuickPopupTransitionManager::transitionExit() qquickpopup.cpp:1326
        #38 0x000107c23fd4 in QQuickPopup::setVisible(bool) qquickpopup.cpp:2496
        #39 0x000107c104d8 in QQuickPopup::close() qquickpopup.cpp:1408
        #40 0x000107c1ba80 in QQuickPopup::setParentItem(QQuickItem*) qquickpopup.cpp:2180
        #41 0x000107c1b324 in QQuickPopupPrivate::itemDestroyed(QQuickItem*) qquickpopup.cpp:1063
        #42 0x000107c1bb8c in non-virtual thunk to QQuickPopupPrivate::itemDestroyed(QQuickItem*) qquickpopup.cpp
        #43 0x00010c117f70 in void QQuickItemPrivate::notifyChangeListeners<void (QQuickItemChangeListener::*)(QQuickItem*), QQuickItem*>(QFlags<QQuickItemPrivate::ChangeType>, void (QQuickItemChangeListener::*&&)(QQuickItem*), QQuickItem*&&) qquickitem_p.h:413
        #44 0x00010c113d7c in QQuickItem::~QQuickItem() qquickitem.cpp:2420
        #45 0x00010c50e3e8 in QQuickRootItem::~QQuickRootItem() qquickwindow_p.h:62
        #46 0x00010c4ed840 in QQuickRootItem::~QQuickRootItem() qquickwindow_p.h:62
        #47 0x00010c4ed86c in QQuickRootItem::~QQuickRootItem() qquickwindow_p.h:62
        #48 0x00010c4da1c0 in QQuickWindow::~QQuickWindow() qquickwindow.cpp:1197
        #49 0x00010c531f34 in QQuickWindowQmlImpl::~QQuickWindowQmlImpl() qquickwindowmodule.cpp:73
        #50 0x00010cf2d4f4 in QQmlPrivate::QQmlElement<QQuickWindowQmlImpl>::~QQmlElement() qqmlprivate.h:104
        #51 0x00010cf2d3e0 in QQmlPrivate::QQmlElement<QQuickWindowQmlImpl>::~QQmlElement() qqmlprivate.h:102
        #52 0x00010cf2d40c in QQmlPrivate::QQmlElement<QQuickWindowQmlImpl>::~QQmlElement() qqmlprivate.h:102
        #53 0x00010472efa8 in QScopedPointerDeleter<QObject>::cleanup(QObject*) qscopedpointer.h:24
        #54 0x00010472eefc in QScopedPointer<QObject, QScopedPointerDeleter<QObject>>::~QScopedPointer() qscopedpointer.h:81
        #55 0x00010466f0e8 in QScopedPointer<QObject, QScopedPointerDeleter<QObject>>::~QScopedPointer() qscopedpointer.h:79
        #56 0x00010471246c in QQuickVisualTestUtils::QQuickApplicationHelper::~QQuickApplicationHelper() visualtestutils_p.h:192
        #57 0x00010468ff88 in QQuickVisualTestUtils::QQuickApplicationHelper::~QQuickApplicationHelper() visualtestutils_p.h:192
        #58 0x0001046a953c in tst_QQuickPopup::fadeDimmer() tst_qquickpopup.cpp:2635
        [...]

Amends ef8bde8.

Pick-to: 6.9 6.8
Change-Id: Ie5c49b7d9ecd3c74f822590d296062b516563391
Reviewed-by: Volker Hilsheimer <[email protected]>
(cherry picked from commit f8742ca)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
qtprojectorg pushed a commit that referenced this pull request Sep 12, 2025
@mitchcurtis
tst_QQuickPopup::fadeDimmer: fix stack-use-after-scope
2f28824 
Use dimmer as a context object rather than the test itself, which
outlives it.

The backtrace was:

    FAIL!  : tst_QQuickPopup::Basic::fadeDimmer(modal) The computed value is expected to be greater than the baseline, but is not
       Computed (opacityChangeCount): 2
       Baseline (2)                 : 2
       Loc: [/Users/mitch/dev/qt-dev2/qtdeclarative/tests/auto/quickcontrols/qquickpopup/tst_qquickpopup.cpp(2629)]
    =================================================================
    ==68826==ERROR: AddressSanitizer: stack-use-after-scope on address 0x00016b7f7140 at pc 0x000104743c68 bp 0x00016b7ecfd0 sp 0x00016b7ecfc8
    READ of size 4 at 0x00016b7f7140 thread T0
        #0 0x000104743c64 in tst_QQuickPopup::fadeDimmer()::$_0::operator()() const tst_qquickpopup.cpp:2625
        #1 0x000104743bc0 in QtPrivate::FunctorCall<std::__1::integer_sequence<unsigned long>, QtPrivate::List<>, void, tst_QQuickPopup::fadeDimmer()::$_0>::call(tst_QQuickPopup::fadeDimmer()::$_0&, void**)::'lambda'()::operator()() const qobjectdefs_impl.h:116
        #2 0x000104743b64 in void QtPrivate::FunctorCallBase::call_internal<void, QtPrivate::FunctorCall<std::__1::integer_sequence<unsigned long>, QtPrivate::List<>, void, tst_QQuickPopup::fadeDimmer()::$_0>::call(tst_QQuickPopup::fadeDimmer()::$_0&, void**)::'lambda'()>(void**, QtPrivate::FunctorCall<std::__1::integer_sequence<unsigned long>, QtPrivate::List<>, void, tst_QQuickPopup::fadeDimmer()::$_0>::call(tst_QQuickPopup::fadeDimmer()::$_0&, void**)::'lambda'()&&) qobjectdefs_impl.h:65
        #3 0x000104743ab4 in QtPrivate::FunctorCall<std::__1::integer_sequence<unsigned long>, QtPrivate::List<>, void, tst_QQuickPopup::fadeDimmer()::$_0>::call(tst_QQuickPopup::fadeDimmer()::$_0&, void**) qobjectdefs_impl.h:115
        #4 0x000104743930 in void QtPrivate::FunctorCallable<tst_QQuickPopup::fadeDimmer()::$_0>::call<QtPrivate::List<>, void>(tst_QQuickPopup::fadeDimmer()::$_0&, void*, void**) qobjectdefs_impl.h:337
        #5 0x000104743848 in QtPrivate::QCallableObject<tst_QQuickPopup::fadeDimmer()::$_0, QtPrivate::List<>, void>::impl(int, QtPrivate::QSlotObjectBase*, QObject*, void**, bool*) qobjectdefs_impl.h:547
        #6 0x00011694273c in QtPrivate::QSlotObjectBase::call(QObject*, void**) qobjectdefs_impl.h:461
        #7 0x000116e49454 in void doActivate<false>(QObject*, int, void**) qobject.cpp:4284
        #8 0x000116e467a0 in QMetaObject::activate(QObject*, QMetaObject const*, int, void**) qobject.cpp:4344
        #9 0x00010c1462d4 in QQuickItem::opacityChanged() moc_qquickitem.cpp:1019
        #10 0x00010c1461c8 in QQuickItem::setOpacity(double) qquickitem.cpp:6517
        #11 0x00010c168638 in QQuickItem::qt_static_metacall(QObject*, QMetaObject::Call, int, void**) moc_qquickitem.cpp:850
        #12 0x000113847100 in QQmlPropertyData::writeProperty(QObject*, void*, QFlags<QQmlPropertyData::WriteFlag>) const qqmlpropertydata_p.h:413
        #13 0x000113c33468 in QQmlPropertyPrivate::write(QObject*, QQmlPropertyData const&, QVariant const&, QQmlRefPointer<QQmlContextData> const&, QFlags<QQmlPropertyData::WriteFlag>) qqmlproperty.cpp:1668
        #14 0x000113c32638 in QQmlPropertyPrivate::writeValueProperty(QObject*, QQmlPropertyData const&, QQmlPropertyData const&, QVariant const&, QQmlRefPointer<QQmlContextData> const&, QFlags<QQmlPropertyData::WriteFlag>) qqmlproperty.cpp:1326
        #15 0x000113c32390 in QQmlPropertyPrivate::writeValueProperty(QVariant const&, QFlags<QQmlPropertyData::WriteFlag>) qqmlproperty.cpp:1270
        #16 0x000113c391b4 in QQmlPropertyPrivate::write(QQmlProperty const&, QVariant const&, QFlags<QQmlPropertyData::WriteFlag>) qqmlproperty.cpp:1947
        #17 0x00010c9949ac in QQuickAnimationPropertyUpdater::setValue(double) qquickanimation.cpp:2740
        #18 0x00010c992444 in QQuickBulkValueAnimator::updateCurrentTime(int) qquickanimation.cpp:2069
        #19 0x000114345428 in QAbstractAnimationJob::setCurrentTime(int) qabstractanimationjob.cpp:481
        #20 0x000114349c3c in QAbstractAnimationJob::setState(QAbstractAnimationJob::State) qabstractanimationjob.cpp:367
        #21 0x00011434bc34 in QAbstractAnimationJob::start() qabstractanimationjob.cpp:514
        #22 0x00010c9ff568 in QQuickBehavior::write(QVariant const&) qquickbehavior.cpp:419
        #23 0x00010c9ff88c in non-virtual thunk to QQuickBehavior::write(QVariant const&) qquickbehavior.cpp
        #24 0x000113f53b7c in QQmlInterceptorMetaObject::doIntercept(QMetaObject::Call, int, void**) qqmlvmemetaobject.cpp:392
        #25 0x000113f532e4 in QQmlInterceptorMetaObject::intercept(QMetaObject::Call, int, void**) qqmlvmemetaobject_p.h:153
        #26 0x000113f59788 in QQmlVMEMetaObject::metaCall(QObject*, QMetaObject::Call, int, void**) qqmlvmemetaobject.cpp:750
        #27 0x0001138474d0 in void QQmlPropertyData::doMetacall<(QMetaObject::Call)2>(QObject*, int, void**) const qqmlpropertydata_p.h:395
        #28 0x000113847128 in QQmlPropertyData::writeProperty(QObject*, void*, QFlags<QQmlPropertyData::WriteFlag>) const qqmlpropertydata_p.h:415
        #29 0x000113c33468 in QQmlPropertyPrivate::write(QObject*, QQmlPropertyData const&, QVariant const&, QQmlRefPointer<QQmlContextData> const&, QFlags<QQmlPropertyData::WriteFlag>) qqmlproperty.cpp:1668
        #30 0x000113c32638 in QQmlPropertyPrivate::writeValueProperty(QObject*, QQmlPropertyData const&, QQmlPropertyData const&, QVariant const&, QQmlRefPointer<QQmlContextData> const&, QFlags<QQmlPropertyData::WriteFlag>) qqmlproperty.cpp:1326
        #31 0x000113c32390 in QQmlPropertyPrivate::writeValueProperty(QVariant const&, QFlags<QQmlPropertyData::WriteFlag>) qqmlproperty.cpp:1270
        #32 0x000113c391b4 in QQmlPropertyPrivate::write(QQmlProperty const&, QVariant const&, QFlags<QQmlPropertyData::WriteFlag>) qqmlproperty.cpp:1947
        #33 0x000113c38f84 in QQmlProperty::write(QVariant const&) const qqmlproperty.cpp:1863
        #34 0x000113c39358 in QQmlProperty::write(QObject*, QString const&, QVariant const&) qqmlproperty.cpp:1880
        #35 0x000107c1db04 in QQuickPopupPrivate::hideDimmer() qquickpopup.cpp:1290
        #36 0x000107c16a68 in QQuickPopupPrivate::prepareExitTransition() qquickpopup.cpp:821
        #37 0x000107c1e038 in QQuickPopupTransitionManager::transitionExit() qquickpopup.cpp:1326
        #38 0x000107c23fd4 in QQuickPopup::setVisible(bool) qquickpopup.cpp:2496
        #39 0x000107c104d8 in QQuickPopup::close() qquickpopup.cpp:1408
        #40 0x000107c1ba80 in QQuickPopup::setParentItem(QQuickItem*) qquickpopup.cpp:2180
        #41 0x000107c1b324 in QQuickPopupPrivate::itemDestroyed(QQuickItem*) qquickpopup.cpp:1063
        #42 0x000107c1bb8c in non-virtual thunk to QQuickPopupPrivate::itemDestroyed(QQuickItem*) qquickpopup.cpp
        #43 0x00010c117f70 in void QQuickItemPrivate::notifyChangeListeners<void (QQuickItemChangeListener::*)(QQuickItem*), QQuickItem*>(QFlags<QQuickItemPrivate::ChangeType>, void (QQuickItemChangeListener::*&&)(QQuickItem*), QQuickItem*&&) qquickitem_p.h:413
        #44 0x00010c113d7c in QQuickItem::~QQuickItem() qquickitem.cpp:2420
        #45 0x00010c50e3e8 in QQuickRootItem::~QQuickRootItem() qquickwindow_p.h:62
        #46 0x00010c4ed840 in QQuickRootItem::~QQuickRootItem() qquickwindow_p.h:62
        #47 0x00010c4ed86c in QQuickRootItem::~QQuickRootItem() qquickwindow_p.h:62
        #48 0x00010c4da1c0 in QQuickWindow::~QQuickWindow() qquickwindow.cpp:1197
        #49 0x00010c531f34 in QQuickWindowQmlImpl::~QQuickWindowQmlImpl() qquickwindowmodule.cpp:73
        #50 0x00010cf2d4f4 in QQmlPrivate::QQmlElement<QQuickWindowQmlImpl>::~QQmlElement() qqmlprivate.h:104
        #51 0x00010cf2d3e0 in QQmlPrivate::QQmlElement<QQuickWindowQmlImpl>::~QQmlElement() qqmlprivate.h:102
        #52 0x00010cf2d40c in QQmlPrivate::QQmlElement<QQuickWindowQmlImpl>::~QQmlElement() qqmlprivate.h:102
        #53 0x00010472efa8 in QScopedPointerDeleter<QObject>::cleanup(QObject*) qscopedpointer.h:24
        #54 0x00010472eefc in QScopedPointer<QObject, QScopedPointerDeleter<QObject>>::~QScopedPointer() qscopedpointer.h:81
        #55 0x00010466f0e8 in QScopedPointer<QObject, QScopedPointerDeleter<QObject>>::~QScopedPointer() qscopedpointer.h:79
        #56 0x00010471246c in QQuickVisualTestUtils::QQuickApplicationHelper::~QQuickApplicationHelper() visualtestutils_p.h:192
        #57 0x00010468ff88 in QQuickVisualTestUtils::QQuickApplicationHelper::~QQuickApplicationHelper() visualtestutils_p.h:192
        #58 0x0001046a953c in tst_QQuickPopup::fadeDimmer() tst_qquickpopup.cpp:2635
        [...]

Amends ef8bde8.

Pick-to: 6.8
Change-Id: Ie5c49b7d9ecd3c74f822590d296062b516563391
Reviewed-by: Volker Hilsheimer <[email protected]>
(cherry picked from commit f8742ca)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
(cherry picked from commit cc726a4)
ulfhermannqt and others added 25 commits November 24, 2025 10:19
@ulfhermannqt
QtQml: Don't mark QJSValues on the AOT stack
8e5e37a 
QJSValue and QJSManagedValue hold persistent values which are marked
elsewhere. QJSPrimitiveValue doesn't need to be marked at all.

Amends commit 2d016a2.

Pick-to: 6.10 6.8
Fixes: QTBUG-142097
Change-Id: I50d6405a684726a81ceee506b2d4f8b90330fcaf
Reviewed-by: Sami Shalayel <[email protected]>
@ulfhermannqt
QtQml: Fill in the const iterator functions in the empty sequence
5d0bd46 
Without these you may get an infinite sequence when trying to iterate
using const iterators.

Pick-to: 6.10 6.8
Task-number: QTBUG-142097
Change-Id: Iae93063b240ebe9426804197533ed7efd8e007bc
Reviewed-by: Sami Shalayel <[email protected]>
@alcazaco
Doc: Update links in qml-toc.qdoc
0e13631 
Pick-to: 6.10
Change-Id: Id1cff25028f1e4b79bd53a44950b35643e08ce99
Reviewed-by: Ulf Hermann <[email protected]>
@torarnv
tst_HoverHandler::window: Place window away from menu bar on macOS
311079c 
Pick-to: 6.10 6.8 6.5
Change-Id: I783d368dc9dffd20dad4b238e55d26da57d11d7b
Reviewed-by: Morten Johan Sørvig <[email protected]>
@torarnv
Blacklist Switch mouse/touch tests on macOS 26
023cad2 
Task-number: QTBUG-142189
Change-Id: I863b5773f89528d3582dd83c84cff78d159990c4
Reviewed-by: Richard Moe Gustavsen <[email protected]>
@xavi-b
qmlformat: Add GroupAttributesTogether option
ad58003 
Equivalent to NormalizeOrder but reorder QML categories without
sorting attributes (property definitions, property bindings,
methods, signals, enums)

Fixes: QTBUG-132060
Change-Id: Ib46ce4bb58ce46e3293d14954b0e363837b64b76
Original-patch-by: Oliver Kuss <[email protected]>
Reviewed-by: Semih Yavuz <[email protected]>
Reviewed-by: Sami Shalayel <[email protected]>
Update dependencies on 'dev' in qt/qtdeclarative
42af197 
Change-Id: I6bbd1e28faac21e9e05393362abfee9a9c7b8b5e
Reviewed-by: Qt Submodule Update Bot <[email protected]>
@inharjul
Doc: Add newly published Academy Course for Qt Quick and modify the c…
44e308b 
…ourse listing

Course link added and list modified.

Task-number: QTBUG-142148
Pick-to: 6.10
Change-Id: I8a11394b110a80bb9625d88222b0c5a3a3e6aed4
Reviewed-by: Alexei Cazacov <[email protected]>
@dilekakcaay
Add iOS style for SearchField
df3b945 
Task-number: QTBUG-137318
Pick-to: 6.10
Change-Id: Iead7b9ad0bf22c96d94ab70795fed854f613f6d7
Reviewed-by: Jan Arve Sæther <[email protected]>
@aavit
qml generator: add functionality for animated (morphing) paths
cc506e0 
Add a new Path item to the Helpers module: pathInterpolated, that
holds a list of paths (specified as svg path texts) and has a settable
interpolation factor property. Based on the value factor, the
resulting path will be an interpolation between path #n and path#n+1,
where n is the integer part of the factor. The fractional part
determines the interpolation weight between the two.

Replace the static QPainterPath in PathNodeInfo with an animated
property holding QPainterPath values. During generation, if the
property is found to be animated, a PathInterpolated item is generated
instead of a static PathSvg item.

Change-Id: Ic061005e135cbde1bd88ab1ac7c9e7840f55c232
Reviewed-by: Eskil Abrahamsen Blomfeldt <[email protected]>
@samishalayel
qmllint: don't mixup 'import' and 'import-file-selector' categories
e82ada1 
Don't log warnings of the import-file-selector category using the import
category, and only use the import-file-selector category for that.

It seems the mixup happened when multiple import and
import-file-selector warnings were emitted for the same file, so extend
the current test by introducing another qmllint warning with Broken.qml,
and make sure the import-file-selector warning is emitted via the
correct category-warning-level. The import category has warning level
'warning' while import-file-selector has 'info'.

Amends 3ab60f4.

Pick-to: 6.10
Change-Id: I35acdef46284067a9f23288128108569faa9d90b
Reviewed-by: Ulf Hermann <[email protected]>
@ulfhermannqt
CMake: Allow qmlls.build.ini generation to be skipped
9f03f38 
We don't want a qmlls.build.ini to be generated on a module that's
intentionally hidden from the outside world. That won't work anyway.

Change-Id: I4231361ab4d786d661db19f80b5cf0de84cc0b35
Reviewed-by: Alexandru Croitor <[email protected]>
Reviewed-by: Edward Welbourne <[email protected]>
Fix flaky tst_QQuickMenuBar::subMenuFlipsPositionWhenOutOfBounds
6a497dd 
tst_QQuickMenuBar::subMenuFlipsPositionWhenOutOfBounds is failing on
ubuntu where a keyboard event is sent before the window became active.

Check that the window is active instead of checking if it is exposed,
ensuring the window can properly receive keyboard events.

Change-Id: If4dd3533fc5788f44d6011f89683f4b74ecd77c0
Reviewed-by: Shawn Rutledge <[email protected]>
Android: update manual test for software keyboard
ed9fe1d 
Small update for the Android software keyboard test application.

Replace previous many checkboxes for InputMethodHints related
TextFields with just one, as we can confirm the inputhints working with
just one check.

Add GBoard checkbox for default behavior TextField, as this was missing.

This creates less repetition when running the test.

Task-number: QTBUG-140933
Change-Id: I4eaf340d3240d03225df56e15e37c25082866991
Reviewed-by: Assam Boudjelthia <[email protected]>
@iCristalrope
QV4: Hotfix bump QV4_DATA_STRUCTURE_VERSION to invalidate broken cache
cbe29e4 
Task-number: QTBUG-142186
Pick-to: 6.10
Change-Id: I07228c1ddd9196532886ad3b39751d525c525432
Reviewed-by: Ulf Hermann <[email protected]>
@ulfhermannqt
EventReplay: Ignore double-click events when replaying
e018629 
We receive the individual press and release events already. Those are
enough to synthesize the double-click. The platform abstraction does not
like to be explicitly told about double-clicks.

Change-Id: Ie8da32de742e601dc99af3afee82d6177d8a7156
Reviewed-by: Shawn Rutledge <[email protected]>
@ulfhermannqt
QmlPreview: Allow setting animation speed
2b7714f 
This is the same functionality we already have in the inspector service.
However, we need it in the preview, too. For such a simple thing you
shouldn't need to instantiate an extra debug service.

The animation speed method in the preview service also doesn't invert
the speed modifier. So, for double animation speed you need to pass 2,
not 0.5.

Fix the test to a, check the animation speed only on new output, rather
than everything the application has printed before and b, actually check
whether the number is in the intended range.

Task-number: QTBUG-141569
Change-Id: Ie7f7b043fb295e7c5da333ab4501059f07f2e3cd
Reviewed-by: Sami Shalayel <[email protected]>
Reviewed-by: Olivier De Cannière <[email protected]>
Stop flooding the log with animation timer type
88c83cb 
This variable used to be static and the logic still looks like it expects it
to be so. Static was probably removed in an error. This causes unnecessary
environment variable reading and logs being printed as this function is
being called for every frame.

Change-Id: Id24d9cfecb0f509f92cef47f6a95800ff529259b
Reviewed-by: Laszlo Agocs <[email protected]>
Fix CalendarModel month count calculation
6915a4b 
CalendarModel used previously set from and to values to calculate the
range and thus the count wasn't ever up to date.

Fixes: QTBUG-141883
Pick-to: 6.10 6.8
Change-Id: Id3ef60810d2e8ebfcc060307e6d17cfca379cd78
Reviewed-by: Mitch Curtis <[email protected]>
@AhmadSamir
Remove redundant Q_FLAGS from classes that don't inherit from QObject
80103fd 
Pick-to: 6.10 6.8 6.5
Change-Id: I810a7137470e0ee96c76819766ede2e9bc643d73
Reviewed-by: Ulf Hermann <[email protected]>
@Inkane
qqlmjs.g: Remove expect statement
daedd50 
We do, in fact, not expect any parsing conflict.

Change-Id: I2df5e27f42dbdd7660eb0383da3c2bb01c6fc84e
Reviewed-by: Sami Shalayel <[email protected]>
@torarnv
Avoid "replacing existing signature" message when signing qmltestrunner
a7084ab 
Instead of forcing a re-sign, we remove the signature first, which
makes the operation silent in the success case.

Change-Id: Ic312eacfd87a6eb5795a6bd1fe841b9c37d8359d
Reviewed-by: Alexandru Croitor <[email protected]>
@jepasionQt
Doc: Add alternate text for Qt Quick and Qt Quick Controls images
5dceaca 
Alternate text (alt text) improves the documentation experience for
screen readers and for other accessibility tools.

Pick-to: 6.9 6.10
Task-number: QTBUG-135120
Change-Id: I975c3de11f893882fb9a27218079f244bd38a622
Reviewed-by: Mitch Curtis <[email protected]>
@marcmutz
QJSEngine: fix -Wnrvo in coerceValue() and fromVariant()
433624d 
... as a preparation of enabling the flag in headerscheck.

The coerceValue() functions was actually flagged by GCC in a
headerscheck including -Wnrvo, probably because it was instantiated
for some type in inline code. The fromVariant() function was not
flagged automatically, but found by manual inspection.

Because the structure of code, with the pre-existing extra scope,
lends itself naturally to it, wrap the code that doesn't already
return rvalues in an IILE. Outside the lambda, the return is now
RVO'ed, and inside, NRVO'ed.

Manual inspection also found the qjsvalue_cast() overloaded functions,
but I don't readily see a fix for them, so deferring. GCC doesn't warn
for function templates unless instantiated, so for the purposes of
headerscheck, we should be good with the status quo.

Amends 7b29ed6 (coerceValue()) and
d0f4e0c (fromVariant()).

Pick-to: 6.10 6.8 6.5
Task-number: QTBUG-142146
Change-Id: I2aa0ecb5a1cdc975c2ab8dffb9fe333bbeb7bc0f
Reviewed-by: Ulf Hermann <[email protected]>
Reviewed-by: Allan Sandfeld Jensen <[email protected]>
@marcmutz
QJSList: restore NRVO in slice(), join() specialization
0b1074b 
... for <QQmlListProperty<QObject>, QObject *>>.

Like in the primary template, return the same object in each return
statement, fixing GCC -Wnrvo, which we're going to add to
headersclean.

Amends e846864.

Pick-to: 6.10 6.8 6.5
Task-number: QTBUG-142146
Change-Id: I38e9e8374e51d147cdaf4276fa791489117ee4e3
Reviewed-by: Ulf Hermann <[email protected]>
timblechmann and others added 30 commits December 17, 2025 08:59
@timblechmann
QSGThreadedRenderLoop: fix typo in tracing
a09de70 
Pick-to: 6.11 6.10 6.8
Change-Id: I0f48169d4678fc72dc16946bd6c4bf566ef48729
Reviewed-by: Ulf Hermann <[email protected]>
@dilekakcaay @mitchcurtis
SearchField: Update the control's documentation
c3408ef 
SearchField documentation was outdated. The description of
currentIndex was updated, and a note was added for the iOS
style explaining that the control doesn't provide a popup in
order to preserve the native look.

Pick-to: 6.11 6.10
Change-Id: I6ff23f51c0cf73a44baad7236c176363b3970f8e
Reviewed-by: Mitch Curtis <[email protected]>
doc: Fix links from Qt.labs.platform dialogs to QtQuick.Dialogs dialogs
e56bc13 
The links were broken. This will hopefully make them work, by
referencing QtQuickDialogs in the square brackets.

Pick-to: 6.11
Change-Id: Iad32d85d94caa9624213d07d1da85fbdd6a24e6d
Reviewed-by: Mitch Curtis <[email protected]>
@qtrampe
Android: update Qt Quick for Android examples to SDK 36
f4147c7 
This patch updates qtdeclarative examples to use
SDK 36 as a target and compile version SDK.

Task-number: QTBUG-138552
Task-number: QTBUG-138549
Pick-to: 6.11 6.10 6.8
Change-Id: If655c6654790b4be3704325aceca6df4947362d4
Reviewed-by: Nicholas Bennett <[email protected]>
iOS Switch: Change color of indicator in high contrast mode
c7250f0 
Some of the controls uses image assets as their background.
The Switch is one of those controls, and it's also the control that
changes its appearance the most when "Increase contrast" is toggled on.

Done-with: Karolina Bang <[email protected]>
Fixes: QTBUG-142421
Pick-to: 6.11
Change-Id: I350716155bd9a75c241ddc601821de3ded6f7fcb
Reviewed-by: Doris Verria <[email protected]>
@timblechmann
cmake: fix warning in manual test
880eff0 
cmake complains:
  The following keywords are not supported when using
  add_custom_command(TARGET): DEPENDS.

the custom command is triggered whenever the target is built, so extra
dependencies make no real sense. however copy_if_different might be a
little friendlier

Pick-to: 6.11 6.10
Change-Id: I66d0619c39b0c6354d7e6dba5797cdd4b6a116cc
Reviewed-by: Alexandru Croitor <[email protected]>
Reviewed-by: Joerg Bornemann <[email protected]>
@mitchcurtis
FluentWinUI3: don't override properties
e570a51 
These warnings cause tests to fail:

Member state of the object StyleImage_QMLTYPE_29589_QML_29616 overrides
a member of the base object. Consider renaming it or adding final or
virtual specifier

Member __notCustomizable of the object SearchField_QMLTYPE_168
overrides a member of the base object. Consider renaming it or adding
final or virtual specifier

Amends d3ba7eb
and 141993c.

Pick-to: 6.10 6.11
Change-Id: I03d83cdae27715b391ea67372e0b25267d729c77
Reviewed-by: Doris Verria <[email protected]>
Reviewed-by: Dilek Akcay <[email protected]>
@eskilblomfeldt
vectorimage: Fix shadowing warning
145e91d 
After making the QSvgVisitor::traverse() functions virtual,
the compiler now complains that the non-virtual traverse()
in the subclass shadows these. Specifically this was seen
on macOS.

Pick-to: 6.11
Change-Id: I6a3575c9445ba5d5b59c746ed57b7d99d72ada7c
Reviewed-by: Hatem ElKharashy <[email protected]>
@samishalayel
qmlls: process user-triggered requests before linting
87d8043 
The module constructors connect to
QQmlCodeModelManager::updatedSnapshot and the connected methods are
guaranteed to execute in the same order as the connect calls was
called.

First, handle user-triggered operations (go to somewhere, find usages,
etc)
Second, handle semantic highlighting, so the user sees "ah qmlls
finished loading my file" and can already start doing stuff.
Third, handle operations that the user didn't trigger, like the document
outline.
And at last, once everything else is done, lint the file. This is the
step that probably takes most time and should be done at the end, as it
might potentially process many files because of imports etc.

The difference can be seen in QTBUG-142748, where we used to collect
qrc files from the build folder by iterating the build folder during
the linting, while making the user wait for its completion request. The
current behavior now suggests completions before searching the build
folder.

Pick-to: 6.10 6.11
Task-number: QTBUG-142748
Change-Id: I47d5ead79153868721c1b0d95e9b62a14157ef8c
Reviewed-by: Olivier De Cannière <[email protected]>
@samishalayel
qmlls: don't search resource files multiple times from build folder
d5ba405 
Store the resource paths into the codemodels in setBuildPaths.
This avoids iterating the entire build folder on
QQmlJSUtils::resourceFilesFromBuildFolders() in
resourceFilesForFileUrl() which is called on each linting pass.

Amends 7704edb.

Fixes: QTBUG-142748
Change-Id: Ibd3178eef841a39c1c4fa7a3dd7f0750c82745dd
Reviewed-by: Fabian Kosmale <[email protected]>
Reviewed-by: Ulf Hermann <[email protected]>
@dorisverria1
StyleKit: Don't directly point to the reader's palette from the style
415706f 
Add an own QQuikcPalette * member type to the style that should be
synced with the style reader's palette, but don't directly point to it.
This avoids changing the reader's palette from the style, or that the
style palette changes outside of a property read which is problematic.

Task-number: QTBUG-130067
Pick-to: 6.11
Change-Id: I3524c3472a5c250f1f943d2b1b6c66d6fcb93929
Reviewed-by: Richard Moe Gustavsen <[email protected]>
@dorisverria1
StyleKit: Move palettes from QQuickTheme to parent class
ca3912d 
Task-number: QTBUG-130067
Pick-to: 6.11
Change-Id: Ie9c466591fbfbf54d9575d3684636b13c1061d64
Reviewed-by: Richard Moe Gustavsen <[email protected]>
@dorisverria1
StyleKitStyle: Give a parent to palette pointer member
03aee86 
This ensures correct lifetime management of it.

Pick-to: 6.11
Change-Id: I7fd183abf6ab83d8bdc39d9406d044891c14ed6f
Reviewed-by: Richard Moe Gustavsen <[email protected]>
Basic FileDialog: Don't let Folderbreadcrumbbar be smaller than upButton
70b885d 
The up button's size was 40x40, which was taller than the rest of the
Folderbreadcrumbbar. This didn't look right.

Pick-to: 6.11 6.10 6.8
Change-Id: I8d847b04e4a17ba570d366ebc7d584af36542519
Reviewed-by: Mitch Curtis <[email protected]>
Reviewed-by: Santhosh Kumar <[email protected]>
@Morteza-Jamshidi
ColorDialog: use canvas to draw color picker for software renderer
eaebe67 
When backend renderer is software ShaderEffect doesn't render anything,
so we use canvas renderer as a fallback.

Fixes: QTBUG-139362
Change-Id: Id22305ab48d52f9bf2373c88f87cbb10c115999c
Reviewed-by: Oliver Eftevaag <[email protected]>
@samishalayel
DOM: split DomItem::resolve(), part 1
090bf8b 
Its in use, says the profiler, and completely unreadable.
Split the method up in smaller parts.

Task-number: QTBUG-142522
Change-Id: I6e09fd02c8d76fd38855ed2b33d1e5ce101f8e64
Reviewed-by: Fabian Kosmale <[email protected]>
Reviewed-by: Dmitrii Akshintsev <[email protected]>
@samishalayel
qmllint: reword warning about fall-throughs
4f4a024 
The current warning is a bit confusing, reword it to make it clearer and
actually actionable.

Task-number: QTBUG-138532
Change-Id: I1862fc9dd68135500a1b64f1440c770a97f47c02
Reviewed-by: Ulf Hermann <[email protected]>
@samishalayel
quicklintplugin: don't warn on Action not being Actions
4862a75 
It seems we forgot to add Action to the list of allowed types when the
warning was changed to include Action in
7bdeea2.

Pick-to: 6.8 6.10 6.11
Fixes: QTBUG-142549
Change-Id: I52e0ec0110e4d3915f36e3a54843d25b86d21a16
Reviewed-by: Fabian Kosmale <[email protected]>
Reviewed-by: Ulf Hermann <[email protected]>
@samishalayel
qmllint: dont assert on grouped property function definition
0855e8f 
Add an if-condition to avoid triggering the assert inside of
qmllint. The runtime does not register this function
declaration and therefore does not trigger the assert.

QTBUG-142091 will make qmllint warn about the invalid function
definition.

Amends 009ef40.

Pick-to: 6.10 6.11
Fixes: QTBUG-142468
Change-Id: I2077908fdc83fd31bdda67a11f0e8a6949a102ae
Reviewed-by: Ulf Hermann <[email protected]>
@samishalayel
qmlls: slim down .qmlls.ini files
c28d6b7 
We only need .qmlls.ini files to contain the path to the build folder,
and the cmake-calls option (when used by the user).

Remove the outdated import path, and the documentation directory, from
the .qmlls.ini file: instead, it should be read from the
.qmlls.build.ini (which is found by qmlls with help of the .qmlls.ini
file).

Replace add_custom_command with a file(CONFIGURE), now that we don't
need to execute qtpaths anymore for the .qmlls.ini generation.

Change-Id: I2d5e7b164d68e8e092c4995916025fd04d199f12
Reviewed-by: Joerg Bornemann <[email protected]>
@samishalayel
qmlls: don't crash on unknown id
8cb6ee2 
It seems that we recognize "anchors" from
PropertyChanges {
    anchors.topMargin: 12
}
as an id, which might sometimes not exist. Adapt the highlighting code
to not crash if the id does not exist, and highlight it as unknown so
the user sees that its "bad".

Pick-to: 6.10 6.11
Fixes: QTBUG-142574
Change-Id: I00fcea8bfb3d16a95d40af024c4273dae19ce747
Reviewed-by: Fabian Kosmale <[email protected]>
@eskilblomfeldt
svgtoqml: Fix running from packaged build
2353650 
In a packaged build, svgtoqml is placed next to a qt.conf file.
This caused it to fail to launch from anywhere except in its local
directory, with an error that it could not find the QPA plugin.

It turns out that this was triggered by trying to query the
available QPA plugins before creating a QGuiApplication. We did
this to avoid forcing the minimal plugin if it is not available,
but other tools that hardcode this plugin does it unconditionally,
so we do the same in svgtoqml.

Pick-to: 6.11
Task-number: QTBUG-142792
Change-Id: I2b7c0aa20c251a8fbf4f2372b8bc5e0802e298b2
Reviewed-by: Eike Ziller <[email protected]>
Reviewed-by: Eirik Aavitsland <[email protected]>
@samishalayel
qqmldomastcreator: remove Q_UNREACHABLE that gets hit
0953b87 
It seems that Q_UNREACHABLE triggers UB at runtime when hit in a release
build, so remove it and log an error instead. Ignore the invalid part.

Pick-to: 6.11 6.10 6.8
Fixes: QTBUG-142711
Change-Id: I445e46a6964f072a939cd6666c15c8d1ff5a0966
Reviewed-by: Fabian Kosmale <[email protected]>
macOS: draw ComboBox correctly on macOS 26
4903304 
On macOS 26, the down indicator in editable ComboBoxes
was drawn with scaling applied, causing it to appear
distorted. In addition, the focus frame was misaligned
for both editable and non-editable ComboBoxes.

This patch ensures that ComboBoxes are drawn with 9-patch
scaling disabled. Previously, enabling 9-patch scaling
caused the down indicator to be scaled together with the
background, resulting in incorrect rendering. The patch
also adjusts margins to properly center the label
and align the focus frame with the control’s frame.

Pick-to: 6.11 6.10 6.8 6.5
Change-Id: I0aafd77dd7ec098589c92fbc161a530a777b1d91
Reviewed-by: Timur Pocheptsov <[email protected]>
macOS: add some padding inside a Frame and GroupBox
9d5e00c 
Previously, the padding was taken from NativeStyle.Frame,
which effectively returned the margins from QQuickCommonStyle.
These margins only account for the frame border width and
nothing else. As a result, controls appear glued to the edge
of a Frame when using the macOS style, unless the application
explicitly overrides the margins.

This patch therefore hard-codes margins matching those used by
the Fusion style, giving Frame and GroupBox a bit more visual
“air”, similar to the other styles.

Pick-to: 6.11 6.10 6.8 6.5
Change-Id: I6a80530d07a43bcaa6761cf3fc2d8a14e1fd0977
Reviewed-by: Timur Pocheptsov <[email protected]>
macOS: adjust button layout margins according to macOS 26
4e31c33 
The layout margins on macOS 26 was wrong, which meant
a the focus ring on top of it would look really wrong
(if button focus was enabled from system settings).

This patch will adjust the layout rect so that it looks
correct on macOS 26.

Pick-to: 6.11 6.10 6.8 6.5
Change-Id: I828a4a25d3ffa58dd1fc942c25db1dcbb59f7525
Reviewed-by: Timur Pocheptsov <[email protected]>
macOS: adjust SearchField focus rect and radius
f994fe4 
Adjust the focus ring slightly, so that it fits the TextField
on both macOS 26 and macOS 16.4 (and before).

Pick-to: 6.11 6.10
Change-Id: Iad1d23284f593a90a252bfdf7c5f6f4d79d309a9
Reviewed-by: Dilek Akcay <[email protected]>
Reviewed-by: Timur Pocheptsov <[email protected]>
macOS: adjust the button margins to ensure the title is centered
a89bad6 
The title (content) margins for a button had different margins
at the top compared to the bottom. The result was that the
label didn't end up centered on the button on macOS 26.

This patch will adjust the button title margins so that the
button label ends up centered on macOS 26. It will also
slighly adjust the margins on macOS16.4, and earlier, to make
label (more) centered on those platforms as well.

Pick-to: 6.11 6.10 6.8 6.5
Change-Id: Icd7571202add65ec312787b0aa94fd1bc49ef72a
Reviewed-by: Timur Pocheptsov <[email protected]>
qquickstyleconstants: notify that native colors may have changed afte…
8a650ed 
…r a theme change

When macOS changes appearance, we need to inform the
style that the system colors have changed. This patch
will therefore listen for changes to the colorScheme
and do just that.

Since the colors we return should match the effective
appearance, we need to wrap the NSColor calls inside
an NSApp.effectiveAppearance block.

Pick-to: 6.11 6.10 6.8 6.5
Change-Id: I282280909927136b85cd8f46f25892f825c8cb02
Reviewed-by: Tor Arne Vestbø <[email protected]>
Doc: Fix QML markup and module links
758fb87 
Prevent auto-linking from occurring in places where QDoc will create an
incorrect link.

Pick-to: 6.8 6.10 6.11
Change-Id: I8a031a3545ea3a785e0cbe762e84c179899e694f
Reviewed-by: Mitch Curtis <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.