21 lines
1.1 KiB
Diff
21 lines
1.1 KiB
Diff
Index: qtbase-opensource-src-5.6.2/src/corelib/kernel/qcoreapplication.cpp
|
|
===================================================================
|
|
--- qtbase-opensource-src-5.6.2.orig/src/corelib/kernel/qcoreapplication.cpp
|
|
+++ qtbase-opensource-src-5.6.2/src/corelib/kernel/qcoreapplication.cpp
|
|
@@ -2533,6 +2533,15 @@ QStringList QCoreApplication::libraryPat
|
|
QStringList *app_libpaths = new QStringList;
|
|
coreappdata()->app_libpaths.reset(app_libpaths);
|
|
|
|
+ // Add library paths derived from NIX_PROFILES.
|
|
+ const QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' ');
|
|
+ const QString plugindir = QString::fromLatin1("/lib/qt5/plugins");
|
|
+ for (const QByteArray &profile: profiles) {
|
|
+ if (!profile.isEmpty()) {
|
|
+ app_libpaths->append(QFile::decodeName(profile) + plugindir);
|
|
+ }
|
|
+ }
|
|
+
|
|
const QByteArray libPathEnv = qgetenv("QT_PLUGIN_PATH");
|
|
if (!libPathEnv.isEmpty()) {
|
|
QStringList paths = QFile::decodeName(libPathEnv).split(QDir::listSeparator(), QString::SkipEmptyParts);
|