summaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
authorLisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>2013-07-02 14:47:17 -0300
committerLisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>2013-07-02 14:47:17 -0300
commitdbf495d5f2ca88897ed6025e5ef10a566d966d37 (patch)
tree617b8a5069da6877895de1a1da7397a0820cbb5d /debian/patches
parent4423d06f42a68c1942f2db018f5f706429f67304 (diff)
downloadqt4-x11-dbf495d5f2ca88897ed6025e5ef10a566d966d37.tar.gz
Refresh qt-multiarch-plugin-path-compat.diff
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/qt-multiarch-plugin-path-compat.diff4
1 files 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