feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Converting plugin paths to native format only for displaying. Using '/' as separator until then, regardless of OS.

Browse Source 
Reviewed-by: hjk
This commit is contained in:
Robert Loehning
2009-07-23 17:04:22 +02:00
parent 47a2097341
commit 8eeabae49d
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/main.cpp
View File

@@ -178,19 +178,19 @@ static inline QStringList getPluginPaths()
// Figure out root: Up one from 'bin'
QDir rootDir = QApplication::applicationDirPath();
rootDir.cdUp();
const QString rootDirPath = QDir::toNativeSeparators(rootDir.canonicalPath());
const QString rootDirPath = rootDir.canonicalPath();
// 1) "plugins" (Win/Linux)
QString pluginPath = rootDirPath;
pluginPath += QDir::separator();
pluginPath += '/';
pluginPath += QLatin1String(IDE_LIBRARY_BASENAME);
pluginPath += QDir::separator();
pluginPath += '/';
pluginPath += QLatin1String("qtcreator");
pluginPath += QDir::separator();
pluginPath += '/';
pluginPath += QLatin1String("plugins");
rc.push_back(pluginPath);
// 2) "PlugIns" (OS X)
pluginPath = rootDirPath;
pluginPath += QDir::separator();
pluginPath += '/';
pluginPath += QLatin1String("PlugIns");
rc.push_back(pluginPath);
return rc;
@@ -269,7 +269,8 @@ int main(int argc, char **argv)
}
}
if (!coreplugin) {
const QString reason = QCoreApplication::translate("Application", "Couldn't find 'Core.pluginspec' in %1").arg(pluginPaths.join(QLatin1String(",")));
QString nativePaths = QDir::toNativeSeparators(pluginPaths.join(QLatin1String(",")));
const QString reason = QCoreApplication::translate("Application", "Couldn't find 'Core.pluginspec' in %1").arg(nativePaths);
displayError(msgCoreLoadFailure(reason));
return 1;
}