Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 02:42:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

check if the canonical library/plugin paths are empty

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-06-14 01:28:13 +03:00
parent 95cea7af62
commit 61fc8e1586
1 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/core/kernel/qcoreapplication.cpp
View file

@ -1640,7 +1640,10 @@ QStringList QCoreApplication::libraryPaths()
} }
foreach (const QString &it, qGetEnvList("LD_LIBRARY_PATH")) { foreach (const QString &it, qGetEnvList("LD_LIBRARY_PATH")) {
QString canonicalPath = QDir(it).canonicalPath(); const QString canonicalPath = QDir(it).canonicalPath();
if (canonicalPath.isEmpty()) {
continue;
}
if (!coreappdata()->app_librarypaths.contains(canonicalPath)) { if (!coreappdata()->app_librarypaths.contains(canonicalPath)) {
coreappdata()->app_librarypaths.append(canonicalPath); coreappdata()->app_librarypaths.append(canonicalPath);
} }
@ -1672,14 +1675,15 @@ void QCoreApplication::setLibraryPaths(const QStringList &paths)
*/ */
void QCoreApplication::addLibraryPath(const QString &path) void QCoreApplication::addLibraryPath(const QString &path)
{ {
if (path.isEmpty()) const QString canonicalPath = QDir(path).canonicalPath();
if (canonicalPath.isEmpty()) {
return; return;
}
// make sure that library paths is initialized // make sure that library paths is initialized
libraryPaths(); libraryPaths();
QMutexLocker locker(qGlobalAppPathsMutex()); QMutexLocker locker(qGlobalAppPathsMutex());
QString canonicalPath = QDir(path).canonicalPath();
if (!coreappdata()->app_librarypaths.contains(canonicalPath)) { if (!coreappdata()->app_librarypaths.contains(canonicalPath)) {
coreappdata()->app_librarypaths.prepend(canonicalPath); coreappdata()->app_librarypaths.prepend(canonicalPath);
} }
@ -1693,14 +1697,15 @@ void QCoreApplication::addLibraryPath(const QString &path)
*/ */
void QCoreApplication::removeLibraryPath(const QString &path) void QCoreApplication::removeLibraryPath(const QString &path)
{ {
if (path.isEmpty()) const QString canonicalPath = QDir(path).canonicalPath();
if (canonicalPath.isEmpty()) {
return; return;
}
// make sure that library paths is initialized // make sure that library paths is initialized
libraryPaths(); libraryPaths();
QMutexLocker locker(qGlobalAppPathsMutex()); QMutexLocker locker(qGlobalAppPathsMutex());
QString canonicalPath = QDir(path).canonicalPath();
coreappdata()->app_librarypaths.removeAll(canonicalPath); coreappdata()->app_librarypaths.removeAll(canonicalPath);
} }
@ -1730,7 +1735,10 @@ QStringList QCoreApplication::pluginPaths()
} }
foreach (const QString &it, qGetEnvList("QT_PLUGIN_PATH")) { foreach (const QString &it, qGetEnvList("QT_PLUGIN_PATH")) {
QString canonicalPath = QDir(it).canonicalPath(); const QString canonicalPath = QDir(it).canonicalPath();
if (canonicalPath.isEmpty()) {
continue;
}
if (!coreappdata()->app_pluginpaths.contains(canonicalPath)) { if (!coreappdata()->app_pluginpaths.contains(canonicalPath)) {
coreappdata()->app_pluginpaths.append(canonicalPath); coreappdata()->app_pluginpaths.append(canonicalPath);
} }
@ -1764,14 +1772,15 @@ void QCoreApplication::setPluginPaths(const QStringList &paths)
*/ */
void QCoreApplication::addPluginPath(const QString &path) void QCoreApplication::addPluginPath(const QString &path)
{ {
if (path.isEmpty()) const QString canonicalPath = QDir(path).canonicalPath();
if (canonicalPath.isEmpty()) {
return; return;
}
// make sure that plugin paths is initialized // make sure that plugin paths is initialized
pluginPaths(); pluginPaths();
QMutexLocker locker(qGlobalAppPathsMutex()); QMutexLocker locker(qGlobalAppPathsMutex());
QString canonicalPath = QDir(path).canonicalPath();
if (!coreappdata()->app_pluginpaths.contains(canonicalPath)) { if (!coreappdata()->app_pluginpaths.contains(canonicalPath)) {
coreappdata()->app_pluginpaths.prepend(canonicalPath); coreappdata()->app_pluginpaths.prepend(canonicalPath);
locker.unlock(); locker.unlock();
@ -1787,14 +1796,15 @@ void QCoreApplication::addPluginPath(const QString &path)
*/ */
void QCoreApplication::removePluginPath(const QString &path) void QCoreApplication::removePluginPath(const QString &path)
{ {
if (path.isEmpty()) const QString canonicalPath = QDir(path).canonicalPath();
if (canonicalPath.isEmpty()) {
return; return;
}
// make sure that plugin paths is initialized // make sure that plugin paths is initialized
pluginPaths(); pluginPaths();
QMutexLocker locker(qGlobalAppPathsMutex()); QMutexLocker locker(qGlobalAppPathsMutex());
QString canonicalPath = QDir(path).canonicalPath();
coreappdata()->app_pluginpaths.removeAll(canonicalPath); coreappdata()->app_pluginpaths.removeAll(canonicalPath);
QFactoryLoader::refreshAll(); QFactoryLoader::refreshAll();
} }