rev 10804 - in trunk/packages/qt4-x11/debian: . patches

Sat May 31 09:23:05 UTC 2008

Author: fabo
Date: 2008-05-31 09:23:04 +0000 (Sat, 31 May 2008)
New Revision: 10804

Added:
   trunk/packages/qt4-x11/debian/patches/0228-qsortfilterproxymodel-invalidate-noscroll.diff
   trunk/packages/qt4-x11/debian/patches/0230-qtextcontrol-selectnextword.diff
Removed:
   trunk/packages/qt4-x11/debian/patches/16_qsortfilterproxymodel_invalidate_noscroll.diff
Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/patches/0227-qdatastream-regression.diff
   trunk/packages/qt4-x11/debian/patches/09_qmake_lflags_as-needed.diff
   trunk/packages/qt4-x11/debian/patches/series
Log:
Refresh patches. prepare for next release.
I'll wait for ipv6 patch from Thiago.


Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================

--- trunk/packages/qt4-x11/debian/changelog	2008-05-31 06:36:54 UTC (rev 10803)
+++ trunk/packages/qt4-x11/debian/changelog	2008-05-31 09:23:04 UTC (rev 10804)
@@ -1,3 +1,15 @@
+qt4-x11 (4.4.0-3) UNRELEASED; urgency=low
+
+  * Add qt-copy patch:
+    * 0230-qtextcontrol-selectnextword
+      Fix Ctrl+Shift+Right in a khtml textarea when having more than one tab
+      open: QTextEdit should react to ShortcutOverride for the keys it handles
+      (was already partly done).
+
+    * 0231- !!! we wait for ipv6 fix !!!
+
+ -- Fathi Boudra <fabo at debian.org>  Sat, 31 May 2008 09:23:04 +0200
+
 qt4-x11 (4.4.0-2) unstable; urgency=low
 
   +++ Changes by Fathi Boudra:
@@ -9,7 +21,7 @@
   * Add qt-copy patch:
     * 0227-qdatastream-regression
       Fix a bug that causes all Qt3/2 applications to crash or hang under KDE4.
-  
+
   +++ Changes by Modestas Vainius:
 
   * Add 16_qsortfilterproxymodel_invalidate_noscroll.diff patch which stops

Modified: trunk/packages/qt4-x11/debian/patches/0227-qdatastream-regression.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0227-qdatastream-regression.diff	2008-05-31 06:36:54 UTC (rev 10803)
+++ trunk/packages/qt4-x11/debian/patches/0227-qdatastream-regression.diff	2008-05-31 09:23:04 UTC (rev 10804)
@@ -1,5 +1,5 @@
-qt-bugs@ issue : none
-Trolltech task ID : None
+qt-bugs@ issue : N211089
+Trolltech task ID : 211301
 bugs.kde.org number : None
 applied: no
 author: Dirk Mueller <mueller at kde.org>

Added: trunk/packages/qt4-x11/debian/patches/0228-qsortfilterproxymodel-invalidate-noscroll.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0228-qsortfilterproxymodel-invalidate-noscroll.diff	                        (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/0228-qsortfilterproxymodel-invalidate-noscroll.diff	2008-05-31 09:23:04 UTC (rev 10804)
@@ -0,0 +1,21 @@
+qt-bugs@ issue : none
+Trolltech task ID : 204403
+bugs.kde.org number : none
+applied: no
+author: Mikko C. <mikko.cal at gmail.com>
+
+Calling QSortFilterProxyModel::invalidate causes view
+to scroll to the current item/index.
+This behavior was not present on the Qt4.3.x. Fixed in Qt4.4.1 snapshots
+
+--- a/src/gui/itemviews/qabstractitemview.cpp
++++ b/src/gui/itemviews/qabstractitemview.cpp
+@@ -2980,7 +2980,7 @@
+     if (q->isVisible()) {
+         q->doItemsLayout();
+         const QModelIndex current = q->currentIndex();
+-        if (current.isValid())
++        if (current.isValid() && state == QAbstractItemView::EditingState)
+             q->scrollTo(current);
+     } else {
+         doDelayedItemsLayout();

Added: trunk/packages/qt4-x11/debian/patches/0230-qtextcontrol-selectnextword.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0230-qtextcontrol-selectnextword.diff	                        (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/0230-qtextcontrol-selectnextword.diff	2008-05-31 09:23:04 UTC (rev 10804)
@@ -0,0 +1,33 @@
+qt-bugs@ issue : N213258
+Trolltech task ID : 213259
+bugs.kde.org number : I guess there is one
+applied: no
+author: David Faure <faure at kde.org>
+
+Imagine a konqueror window with two tabs, and in the current tab there's a QTextEdit (in a web form).
+When typing Ctrl+Shift+Right, it is expected that the next word is selected.
+However, the QAction for "move this tab to the right" is triggered, which is unexpected.
+This wouldn't happen if the QTextEdit would react to the ShortcutOverride event which
+is sent first, for this exact purpose (so that widget-specific shortcuts are done first). 
+QTextControl already handles some ShortcutOverride events, but not all of them.
+The patch below adds a few useful ones, i.e. possibly-conflicting ones. I guess one could
+be exhaustive and list all possible shortcuts there....
+
+
+--- a/src/gui/text/qtextcontrol.cpp
++++ b/src/gui/text/qtextcontrol.cpp
+@@ -1065,6 +1065,14 @@
+                            || ke == QKeySequence::MoveToPreviousWord
+                            || ke == QKeySequence::MoveToStartOfDocument
+                            || ke == QKeySequence::MoveToEndOfDocument
++                           || ke == QKeySequence::SelectNextWord
++                           || ke == QKeySequence::SelectPreviousWord
++                           || ke == QKeySequence::SelectStartOfLine
++                           || ke == QKeySequence::SelectEndOfLine
++                           || ke == QKeySequence::SelectStartOfBlock
++                           || ke == QKeySequence::SelectEndOfBlock
++                           || ke == QKeySequence::SelectStartOfDocument
++                           || ke == QKeySequence::SelectEndOfDocument
+                           ) {
+                     ke->accept();
+ #endif

Modified: trunk/packages/qt4-x11/debian/patches/09_qmake_lflags_as-needed.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/09_qmake_lflags_as-needed.diff	2008-05-31 06:36:54 UTC (rev 10803)
+++ trunk/packages/qt4-x11/debian/patches/09_qmake_lflags_as-needed.diff	2008-05-31 09:23:04 UTC (rev 10804)
@@ -5,7 +5,7 @@
 
 --- a/configure
 +++ b/configure
-@@ -500,6 +500,8 @@
+@@ -503,6 +503,8 @@
  rm -f "$outpath/config.tests/.qmake.cache"
  cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache"
  

Deleted: trunk/packages/qt4-x11/debian/patches/16_qsortfilterproxymodel_invalidate_noscroll.diff

Modified: trunk/packages/qt4-x11/debian/patches/series
===================================================================
--- trunk/packages/qt4-x11/debian/patches/series	2008-05-31 06:36:54 UTC (rev 10803)
+++ trunk/packages/qt4-x11/debian/patches/series	2008-05-31 09:23:04 UTC (rev 10804)
@@ -13,6 +13,8 @@
 0225-invalidate-tabbar-geometry-on-refresh.diff
 0226-qtreeview-column_resize_when_needed.diff
 0227-qdatastream-regression.diff
+0228-qsortfilterproxymodel-invalidate-noscroll.diff
+0230-qtextcontrol-selectnextword.diff
 
 # debian patches
 01_qmake_for_debian.diff
@@ -26,7 +28,6 @@
 12_fix_qmake_pkgconfig.diff
 14_add_libraries_to_gui_build_where_actually_needed.diff
 15_fix_qmake_makefile_generation.diff
-16_qsortfilterproxymodel_invalidate_noscroll.diff
 20_mips_atomic_ops.diff
 40_alpha_ice.diff
 41_disable_opengl_visibility.diff


