alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't use QStringLiteral when concatenating string literals.

Browse Source 
QStringLiteral("foo" "bar") is documented not to work on MSVC.
This commit is contained in:
Nicolás Alvarez 2014-08-30 14:46:36 -03:00
parent 123d5a6d8b
commit 51b77bcd59
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/plasma/private/theme_p.cpp
View File

@ -722,7 +722,8 @@ void ThemePrivate::setThemeName(const QString &tempThemeName, bool writeSettings
QString themePath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QLatin1Literal(PLASMA_RELATIVE_DATA_INSTALL_DIR "/desktoptheme/") % theme % "/metadata.desktop"); QString themePath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QLatin1Literal(PLASMA_RELATIVE_DATA_INSTALL_DIR "/desktoptheme/") % theme % "/metadata.desktop");
if (themePath.isEmpty() && themeName.isEmpty()) { if (themePath.isEmpty() && themeName.isEmpty()) {
themePath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral(PLASMA_RELATIVE_DATA_INSTALL_DIR "/desktoptheme/default"), QStandardPaths::LocateDirectory); // note: can't use QStringLiteral("foo" "bar") on Windows
themePath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QString(PLASMA_RELATIVE_DATA_INSTALL_DIR "/desktoptheme/default"), QStandardPaths::LocateDirectory);
if (themePath.isEmpty()) { if (themePath.isEmpty()) {
return; return;