AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use QFile::{encode,decode}Name to deal with QT_PLUGIN_PATH

Browse Source 
Since it deals with paths, let's use the proper path-handling
functions.

Change-Id: I896d2c472dfd675e9ff247657447178702f178be
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
This commit is contained in:
Thiago Macieira 2012-05-02 15:36:35 +02:00 committed by Qt by Nokia
parent 26e47c0353
commit 41b1fb918b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/kernel/qcoreapplication.cpp
View File

@ -2055,7 +2055,7 @@ QStringList QCoreApplication::libraryPaths()
#else
QLatin1Char pathSep(':');
#endif
QStringList paths = QString::fromLatin1(libPathEnv).split(pathSep, QString::SkipEmptyParts);
QStringList paths = QFile::decodeName(libPathEnv).split(pathSep, QString::SkipEmptyParts);
for (QStringList::const_iterator it = paths.constBegin(); it != paths.constEnd(); ++it) {
QString canonicalPath = QDir(*it).canonicalPath();
if (!canonicalPath.isEmpty()

2
tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
View File

@ -955,7 +955,7 @@ void tst_QApplication::libraryPaths_qt_plugin_path()
// Our hook into libraryPaths() initialization: Set the QT_PLUGIN_PATH environment variable
QString installPathPluginsDeCanon = appDirPath + QString::fromLatin1("/tmp/..");
QByteArray ascii = installPathPluginsDeCanon.toAscii();
QByteArray ascii = QFile::encodeName(installPathPluginsDeCanon);
qputenv("QT_PLUGIN_PATH", ascii);
QVERIFY(!app.libraryPaths().contains(appDirPath + QString::fromLatin1("/tmp/..")));