[SCM] Qt 4 packaging branch, master, updated. debian/4.7.3-8-20-gb444ffb

Pino Toscano pino at alioth.debian.org
Fri Sep 23 11:17:26 UTC 2011


The following commit has been merged in the master branch:
commit b444ffb53ee5d56371f3b77313b92a36c09b8a8e
Author: Pino Toscano <pino at debian.org>
Date:   Fri Sep 23 13:17:09 2011 +0200

    qt-multiarch-plugin-path-compat.diff: use QLatin1String when comparing to raw C strings
---
 .../patches/qt-multiarch-plugin-path-compat.diff   |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/debian/patches/qt-multiarch-plugin-path-compat.diff b/debian/patches/qt-multiarch-plugin-path-compat.diff
index d88a4bc..2f5a5bb 100644
--- a/debian/patches/qt-multiarch-plugin-path-compat.diff
+++ b/debian/patches/qt-multiarch-plugin-path-compat.diff
@@ -5,6 +5,7 @@ Description: include legacy pre-multiarch plugin path
  the plugin path, include both the configured plugin path and a plugin path
  with the architecture triplet stripped out.
 Author: Steve Langasek <steve.langasek at ubuntu.com>
+Last-Update: 2011-09-23
 
 ---
  src/corelib/kernel/qcoreapplication.cpp |   17 +++++++++++++++++
@@ -18,7 +19,7 @@ Author: Steve Langasek <steve.langasek at ubuntu.com>
          }
 +        QString pathSep("/");
 +        QStringList dirnames = QString(installPathPlugins).split(QLatin1Char('/'), QString::SkipEmptyParts);
-+        if (dirnames[0] == QString("usr") && dirnames[1] == QString("lib") && dirnames[3] == "qt4")
++        if (dirnames[0] == QLatin1String("usr") && dirnames[1] == QLatin1String("lib") && dirnames[3] == QLatin1String("qt4"))
 +        {
 +            QString legacyPathPlugins = pathSep;
 +            int i = 0;

-- 
Qt 4 packaging



More information about the pkg-kde-commits mailing list