diff options
| author | Sune Vuorela <debian@pusling.com> | 2008-07-09 00:30:07 +0000 |
|---|---|---|
| committer | Sune Vuorela <debian@pusling.com> | 2008-07-09 00:30:07 +0000 |
| commit | b94481065d9b121f6eba195673a312f1521b345a (patch) | |
| tree | 1f43d8ad6caeb77c501a6fe64c2816f8925e3e6e | |
| parent | 9577d33324b2c0b220bd842bac75c2e10afd6133 (diff) | |
| download | qt4-x11-b94481065d9b121f6eba195673a312f1521b345a.tar.gz | |
Add 0236-qtoolbararealayout-restore.diff to fix a regression in qt4.4.
Patch from Trolltech.
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/patches/0236-qtoolbararealayout-restore.diff | 23 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 26 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 59641dd..9f86b9a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,8 @@ qt4-x11 (4.4.0-4~pre1) unstable; urgency=low of Mike Hommey in the gtk webkit package. * Add 0235-qdbus-dispatch-async-timeout.diff from qt copy. Acked in qt-copy by Thiago. + * Add 0236-qtoolbararealayout-restore.diff to fix a regression in qt4.4. + Patch from Trolltech. +++ Changes by Modestas Vainius: diff --git a/debian/patches/0236-qtoolbararealayout-restore.diff b/debian/patches/0236-qtoolbararealayout-restore.diff new file mode 100644 index 0000000..df6af36 --- /dev/null +++ b/debian/patches/0236-qtoolbararealayout-restore.diff @@ -0,0 +1,23 @@ +qt-bugs@ issue : N218280 +Trolltech task ID : 218280 +bugs.kde.org number : none +applied: yes +author: TT + +QMainWindow::restoreState doesn't layout toolbars properly, regression +from Qt-4.4 + +Index: src/gui/widgets/qtoolbararealayout.cpp +=================================================================== +--- src/gui/widgets/qtoolbararealayout.cpp (revision 829449) ++++ src/gui/widgets/qtoolbararealayout.cpp (working copy) +@@ -1323,7 +1323,8 @@ bool QToolBarAreaLayout::restoreState(QD + toolBar->setVisible(shown); + toolBar->d_func()->setWindowState(floating, true, rect); + +- item.extraSpace = item.size - pick(line.o, item.sizeHint()); ++ //if it is -1, it means we should use the default size ++ item.extraSpace = (item.size == -1) ? 0 : item.size - pick(line.o, item.sizeHint()); + + + line.toolBarItems.append(item); diff --git a/debian/patches/series b/debian/patches/series index 6d385f4..041747f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -21,6 +21,7 @@ 0233-fix-q3textbrowser-image.diff # debian patches +0236-qtoolbararealayout-restore.diff 0235-qdbus-dispatch-async-timeout.diff 01_qmake_for_debian.diff 02_launch_assistant-qt4.diff |