Reviewing merge request #2296: Fixed QTBUG-5448, problems with nested layouts

Fixed bug QTBUG-5448 by not only invalidating the parent widget's top layout, but also the layout hierarchy between the changed widget and the parent widget.

Requested by: Christoph Schleifenbaum
Status: Rejected
Source repository: kdab-for-upstream:nested-layouts-fix
Target repository: qt:master
Created at: January 29th, 2010 12:11

Commits that would be merged:

Version 1

Version 1

2427055
b8dc8e8

Fix QTBUG-5448, make sure not only the parent's layout gets invalidated

Showing

Showing 2427055-b8dc8e8

Comments
Include comments entered inline

→ State changed from New to Rejected

This one is replaced with merge request 2298.

Christoph Schleifenbaum | 2010-01-29 18:25:19 UTC

Rejected since it has been replaced with 2298

janarve | 2010-02-04 13:46:29 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/2296

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

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

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

Reviewing merge request #2296: Fixed QTBUG-5448, problems with nested layouts

Commits that would be merged:

Comments Include comments entered inline

Add a new comment:

Gitorious

Comments
Include comments entered inline