[SCM] Qt 4 packaging branch, master, updated. debian/4.8.4+dfsg-4-24-g121231d

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=commitdiff;h=dbf495d

The following commit has been merged in the master branch:
commit dbf495d5f2ca88897ed6025e5ef10a566d966d37
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue Jul 2 14:47:17 2013 -0300

    Refresh qt-multiarch-plugin-path-compat.diff
---
 debian/patches/qt-multiarch-plugin-path-compat.diff |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/patches/qt-multiarch-plugin-path-compat.diff b/debian/patches/qt-multiarch-plugin-path-compat.diff
index 1847d7c..02db5f2 100644
--- a/debian/patches/qt-multiarch-plugin-path-compat.diff
+++ b/debian/patches/qt-multiarch-plugin-path-compat.diff
@@ -17,7 +17,7 @@ Last-Update: 2012-04-25
 
 --- a/src/corelib/kernel/qcoreapplication.cpp
 +++ b/src/corelib/kernel/qcoreapplication.cpp
-@@ -2507,6 +2507,23 @@ QStringList QCoreApplication::libraryPat
+@@ -2511,6 +2511,23 @@ QStringList QCoreApplication::libraryPat
              if (!app_libpaths->contains(installPathPlugins))
                  app_libpaths->append(installPathPlugins);
          }
@@ -43,7 +43,7 @@ Last-Update: 2012-04-25
          // If QCoreApplication is not yet instantiated,
 --- a/src/declarative/qml/qdeclarativeimport.cpp
 +++ b/src/declarative/qml/qdeclarativeimport.cpp
-@@ -751,6 +751,22 @@ QDeclarativeImportDatabase::QDeclarative
+@@ -770,6 +770,22 @@ QDeclarativeImportDatabase::QDeclarative
          addImportPath(installImportsPath);
      }
  #else

-- 
Qt 4 packaging