[SCM] Qt 4 Debian packaging branch, master, updated. debian/4.6.0-1-41-g5868e5d

[Fathi Boudra]

The following commit has been merged in the master branch:
commit 5868e5d8f81c9f3257572577a2a9d280736823a2
Author: Fathi Boudra <fabo at debian.org>
Date:   Sun Jan 31 19:26:25 2010 +0100

    Remove 0289-context-for-shortcuts-tr.diff - rejected upstream.
---
 debian/changelog                                  |    1 +
 debian/patches/0289-context-for-shortcuts-tr.diff |   65 ---------------------
 debian/patches/series                             |    1 -
 3 files changed, 1 insertions(+), 66 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1d676a9..f0ee19f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,7 @@ qt4-x11 (4:4.6.1-1) UNRELEASED; urgency=low
   * Remove patches:
     - 19_install_qdoc3.diff - merged upstream.
     - 81_hurd_clock_gettime.diff - merged upstream.
+    - 0289-context-for-shortcuts-tr.diff - rejected upstream.
   * Merge with Kubuntu:
     - add 21_qt_ia32_library_path.diff patch
       fix ia32 library path (e.g. skype application).
diff --git a/debian/patches/0289-context-for-shortcuts-tr.diff b/debian/patches/0289-context-for-shortcuts-tr.diff
deleted file mode 100644
index 0fd3fca..0000000
--- a/debian/patches/0289-context-for-shortcuts-tr.diff
+++ /dev/null
@@ -1,65 +0,0 @@
-From 9eb3560cfd5cd0bc9c7bf79f2c27657ee07b8f95 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid at kde.org>
-Date: Sat, 8 Aug 2009 14:40:25 +0200
-Subject: [PATCH 17/18] Add context to tr calls in QShortcut
-
-Some languages have special rules for using "+" to concatenate strings and
-for example it needs to be Ctrl + Shift instead of Ctrl+Shift, adding
-context to these strings helps creating a more correct translation
----
- src/gui/kernel/qkeysequence.cpp |   20 ++++++++++----------
- 1 files changed, 10 insertions(+), 10 deletions(-)
-
---- a/src/gui/kernel/qkeysequence.cpp
-+++ b/src/gui/kernel/qkeysequence.cpp
-@@ -1153,10 +1153,10 @@ int QKeySequencePrivate::decodeString(co
- 
-     QList<QModifKeyName> modifs;
-     if (nativeText) {
--        modifs << QModifKeyName(Qt::CTRL, QShortcut::tr("Ctrl").toLower().append(QLatin1Char('+')))
--               << QModifKeyName(Qt::SHIFT, QShortcut::tr("Shift").toLower().append(QLatin1Char('+')))
--               << QModifKeyName(Qt::ALT, QShortcut::tr("Alt").toLower().append(QLatin1Char('+')))
--               << QModifKeyName(Qt::META, QShortcut::tr("Meta").toLower().append(QLatin1Char('+')));
-+        modifs << QModifKeyName(Qt::CTRL, QShortcut::tr("Ctrl", "Ctrl key, used for shortcuts").toLower().append(QLatin1Char('+')))
-+               << QModifKeyName(Qt::SHIFT, QShortcut::tr("Shift", "Shift key, used for shortcuts").toLower().append(QLatin1Char('+')))
-+               << QModifKeyName(Qt::ALT, QShortcut::tr("Alt", "Alt key, used for shortcuts").toLower().append(QLatin1Char('+')))
-+               << QModifKeyName(Qt::META, QShortcut::tr("Meta", "Meta key, used for shortcuts").toLower().append(QLatin1Char('+')));
-     }
-     modifs += *gmodifs; // Test non-translated ones last
- 
-@@ -1246,7 +1246,7 @@ QString QKeySequence::encodeString(int k
- static inline void addKey(QString &str, const QString &theKey, QKeySequence::SequenceFormat format)
- {
-     if (!str.isEmpty())
--        str += (format == QKeySequence::NativeText) ? QShortcut::tr("+")
-+        str += (format == QKeySequence::NativeText) ? QShortcut::tr("+", "Symbol used to concatenate keys in shortcuts")
-                                                     : QString::fromLatin1("+");
-     str += theKey;
- }
-@@ -1286,13 +1286,13 @@ QString QKeySequencePrivate::encodeStrin
-     {
-         // On other systems the order is Meta, Control, Alt, Shift
-         if ((key & Qt::META) == Qt::META)
--            s = nativeText ? QShortcut::tr("Meta") : QString::fromLatin1("Meta");
-+            s = nativeText ? QShortcut::tr("Meta", "Meta key, used for shortcuts") : QString::fromLatin1("Meta");
-         if ((key & Qt::CTRL) == Qt::CTRL)
--            addKey(s, nativeText ? QShortcut::tr("Ctrl") : QString::fromLatin1("Ctrl"), format);
-+            addKey(s, nativeText ? QShortcut::tr("Ctrl", "Ctrl key, used for shortcuts") : QString::fromLatin1("Ctrl"), format);
-         if ((key & Qt::ALT) == Qt::ALT)
--            addKey(s, nativeText ? QShortcut::tr("Alt") : QString::fromLatin1("Alt"), format);
-+            addKey(s, nativeText ? QShortcut::tr("Alt", "Alt key, used for shortcuts") : QString::fromLatin1("Alt"), format);
-         if ((key & Qt::SHIFT) == Qt::SHIFT)
--            addKey(s, nativeText ? QShortcut::tr("Shift") : QString::fromLatin1("Shift"), format);
-+            addKey(s, nativeText ? QShortcut::tr("Shift", "Shift key, used for shortcuts") : QString::fromLatin1("Shift"), format);
-     }
- 
- 
-@@ -1307,7 +1307,7 @@ QString QKeySequencePrivate::encodeStrin
-             p += QChar((key-0x10000)%400+0xdc00);
-         }
-     } else if (key >= Qt::Key_F1 && key <= Qt::Key_F35) {
--            p = nativeText ? QShortcut::tr("F%1").arg(key - Qt::Key_F1 + 1)
-+            p = nativeText ? QShortcut::tr("F%1", "Fx key, used for shortcuts").arg(key - Qt::Key_F1 + 1)
-                            : QString::fromLatin1("F%1").arg(key - Qt::Key_F1 + 1);
-     } else if (key) {
-         int i=0;
diff --git a/debian/patches/series b/debian/patches/series
index 3afbc41..9fce92e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,7 +4,6 @@
 0209-prevent-qt-mixing.diff
 0216-allow-isystem-for-headers.diff
 0225-invalidate-tabbar-geometry-on-refresh.patch
-0289-context-for-shortcuts-tr.diff
 
 # debian patches
 01_qmake_for_debian.diff

-- 
Qt 4 Debian packaging