Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: sailfishos-mirror/qtdeclarative
base: 8e85b3089cef6d74c1f048be3e5e6d0a79e68ceb
Choose a base ref
...
head repository: sailfishos-mirror/qtdeclarative
compare: a57731b718f6c126e15b887d20cb7a7bb0c94118
Choose a head ref
  • 3 commits
  • 4 files changed
  • 2 contributors

Commits on Jun 30, 2021

  1. qqmllistmodel: Fix QObjects getting garbage collected

    Previously QObject's could get garbage collected while in use.
    This change fixes this by making them indestructible while in use and then restoring their previous state.
    
    [ChangeLog][QtQml][QQmlListModel][Important Behavior Changes] ListModels now take ownership of the objects added to them, only releasing them after the object has been removed again. This may break existing solutions which rely on the object not being owned by the model.
    
    Fixes: QTBUG-91390
    Change-Id: Ifd37c90e13fb0b6ad8a5a06e89f9fc9a429f6316
    Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
    (cherry picked from commit 16fc4cf)
    Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
    magoldst-qt authored and Qt Cherry-pick Bot committed Jun 30, 2021
    Copy the full SHA
    d30fad2 View commit details
    Browse the repository at this point in the history
  2. QQmlListModel: Guard QObject pointers in the list

    If a QObject in the list is deleted from elsewhere, we need to zero it.
    
    Amends commit 3edac1d0a70961e6f86564cc0a98339df6ac5964.
    
    Fixes: QTBUG-94833
    Change-Id: Ic33a5a0baa160824a34f353806dbfd876fa7123a
    Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io>
    Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
    Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
    (cherry picked from commit b2ee736)
    Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
    Ulf Hermann committed Jun 30, 2021
    Copy the full SHA
    695f636 View commit details
    Browse the repository at this point in the history
  3. Fix QuickTest module

    It should be available under version 6.0 and we don't need to specify
    all the details.
    
    Change-Id: Ic8756d3dc55188693068028d033bc2d13416d885
    Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
    (cherry picked from commit bf17318)
    Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
    Ulf Hermann authored and Qt Cherry-pick Bot committed Jun 30, 2021
    Copy the full SHA
    a57731b View commit details
    Browse the repository at this point in the history