Reviewing merge request #2266: Make layout{AboutToBe,}Changed signals from QSFPM match the source model

This fixes some crashes we experience when moving items in the source model.

The unit test in this MR depends on the change in http://qt.gitorious.org/qt/qt/merge_requests/2262 which should show

http://qt.gitorious.org/~steveire/qt/steveires-clone/commit/826c7cba5368b56114581aa74b8b0b1f092657d0

now but doesn't for some reason even though I tried updating it.

Requested by: Stephen Kelly
Status: Merged
Source repository: steveires-clone:layoutchangematch
Target repository: qt:4.6
Created at: December 8th, 2009 16:46

Commits that would be merged:

Version 3

Version 1
Version 2
Version 3

0a4f8a7
6ace1cb

Make the layout{,AboutToBe}Changed signals in the QSortFilterProxyModel match its source.

Showing

Showing 0a4f8a7-6ace1cb

Comments
Include comments entered inline

Looks ok at a first glance.

I don’t really like the dependencies between tests.

Maybe it is better to put anything that depends on ModelTest in the modeltest directory instead.

Olivier Goffart | 2009-12-09 17:01:34 UTC

If you mean moving dynamictreemodel into the modeltest directory I'd be fine with that.

I can’t do it myself for a few days though.

Stephen Kelly | 2009-12-10 12:41:21 UTC

→ State changed from New to Merged

Merged into oslo-staging-2
315c09c3873f7c5d8b785443372bf975bae47ee7

Olivier Goffart | 2009-12-18 13:35:16 UTC

→ State changed from Merged to Reviewing

This has not been merged yet. 2262 has been merged.

Olivier Goffart | 2009-12-18 13:50:45 UTC

→ State changed from Reviewing to Merged

Now merged 82a35ed3f1dede556e9ab6e30b86997c4a8f0fd1

Olivier Goffart | 2009-12-18 14:29:05 UTC

Add a new comment:

Login or create an account to post a comment

How to apply this merge request to your repository

One way to merge in these changes is to pull them into a local branch for review, verifying the changes and then merge to back to master.

# Check out a new branch for integration
git checkout -b merge-requests/2266

# Fetch the merge request into this branch
git pull \
  git://gitorious.org/qt/qt.git \
  refs/merge-requests/2266

# Show the commits, assess they are okay
git log --pretty=oneline --abbrev-commit 4.6..merge-requests/2266

# To apply the changes to your branch:
git checkout 4.6
git merge merge-requests/2266
git push origin 4.6

Reviewing merge request #2266: Make layout{AboutToBe,}Changed signals from QSFPM match the source model

Commits that would be merged:

Comments Include comments entered inline

Add a new comment:

Gitorious

Comments
Include comments entered inline