29 lines
1.6 KiB
Diff
29 lines
1.6 KiB
Diff
|
diff -up qt-everywhere-opensource-src-4.8.5/src/corelib/kernel/qcoreapplication.cpp.kde4_plugins qt-everywhere-opensource-src-4.8.5/src/corelib/kernel/qcoreapplication.cpp
|
||
|
|
--- qt-everywhere-opensource-src-4.8.5/src/corelib/kernel/qcoreapplication.cpp.kde4_plugins 2013-06-07 00:16:52.000000000 -0500
|
||
|
|
+++ qt-everywhere-opensource-src-4.8.5/src/corelib/kernel/qcoreapplication.cpp 2013-06-18 13:31:35.357173956 -0500
|
||
|
|
@@ -2511,6 +2511,24 @@ QStringList QCoreApplication::libraryPat
|
||
|
|
if (!app_libpaths->contains(installPathPlugins))
|
||
|
|
app_libpaths->append(installPathPlugins);
|
||
|
|
}
|
||
|
|
+
|
||
|
|
+ // hack in support for kde4 plugin paths -- Rex
|
||
|
|
+ QString kde4PathPlugins = QLibraryInfo::location(QLibraryInfo::LibrariesPath) + QLatin1String("/kde4/plugins");
|
||
|
|
+ if (QFile::exists(kde4PathPlugins)) {
|
||
|
|
+ // Make sure we convert from backslashes to slashes.
|
||
|
|
+ //kde4PathPlugins = QDir(kde4PathPlugins).canonicalPath();
|
||
|
|
+ if (!app_libpaths->contains(kde4PathPlugins))
|
||
|
|
+ app_libpaths->append(kde4PathPlugins);
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ // hack in support for multilib qt4 plugin path -- Rex
|
||
|
|
+ QString qt4_multilibPathPlugins = QLatin1String("/usr/lib/qt4/plugins");
|
||
|
|
+ if (QFile::exists(qt4_multilibPathPlugins)) {
|
||
|
|
+ // Make sure we convert from backslashes to slashes.
|
||
|
|
+ //qt4_multilibPathPlugins = QDir(qt4_multilibPathPlugins).canonicalPath();
|
||
|
|
+ if (!app_libpaths->contains(qt4_multilibPathPlugins))
|
||
|
|
+ app_libpaths->append(qt4_multilibPathPlugins);
|
||
|
|
+ }
|
||
|
|
#endif
|
||
|
|
|
||
|
|
// If QCoreApplication is not yet instantiated,
|