]> git.ipfire.org Git - people/stevee/ipfire-3.x.git/blob - pkgs/qt/patches/qt-everywhere-opensource-src-4.7.0-beta2-kde4_plugins.patch
822ace87f0d21c8ee3af99ee44887730a59324b1
[people/stevee/ipfire-3.x.git] / pkgs / qt / patches / qt-everywhere-opensource-src-4.7.0-beta2-kde4_plugins.patch
1 diff -up qt-everywhere-opensource-src-4.7.0-beta2/src/corelib/kernel/qcoreapplication.cpp.kde4_plugins qt-everywhere-opensource-src-4.7.0-beta2/src/corelib/kernel/qcoreapplication.cpp
2 --- qt-everywhere-opensource-src-4.7.0-beta2/src/corelib/kernel/qcoreapplication.cpp.kde4_plugins 2010-06-29 20:53:15.000000000 -0500
3 +++ qt-everywhere-opensource-src-4.7.0-beta2/src/corelib/kernel/qcoreapplication.cpp 2010-07-08 08:24:12.714604479 -0500
4 @@ -2262,6 +2262,15 @@ QStringList QCoreApplication::libraryPat
5 if (!app_libpaths->contains(installPathPlugins))
6 app_libpaths->append(installPathPlugins);
7 }
8 +
9 + // hack in support for kde4 plugin paths -- Rex
10 + QString kde4PathPlugins = QLibraryInfo::location(QLibraryInfo::LibrariesPath) + QLatin1String("/kde4/plugins");
11 + if (QFile::exists(kde4PathPlugins)) {
12 + // Make sure we convert from backslashes to slashes.
13 + // kde4PathPlugins = QDir(kde4PathPlugins).canonicalPath();
14 + if (!app_libpaths->contains(kde4PathPlugins))
15 + app_libpaths->append(kde4PathPlugins);
16 + }
17 #endif
18
19 // If QCoreApplication is not yet instantiated,