Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix building with C++11

  • Loading branch information...
commit 83e1725551c827da65376500a189b0a61fad7f56 1 parent c955007
@amoskvin amoskvin authored
Showing with 5 additions and 4 deletions.
  1. +5 −4 libraries/qtxdg/qiconfix/qiconloader.cpp
View
9 libraries/qtxdg/qiconfix/qiconloader.cpp
@@ -351,22 +351,23 @@ QThemeIconEntries QIconLoader::findIconHelper(const QString &themeName,
const QString pixmaps(QLatin1String("/usr/share/pixmaps"));
QDir currentDir(pixmaps);
+ QIconDirInfo dirInfo(pixmaps);
if (currentDir.exists(iconName + pngext)) {
PixmapEntry *iconEntry = new PixmapEntry;
- iconEntry->dir = pixmaps;
+ iconEntry->dir = dirInfo;
iconEntry->filename = currentDir.filePath(iconName + pngext);
- // Notice we ensure that pixmap entries allways come before
+ // Notice we ensure that pixmap entries always come before
// scalable to preserve search order afterwards
entries.prepend(iconEntry);
} else if (m_supportsSvg &&
currentDir.exists(iconName + svgext)) {
ScalableEntry *iconEntry = new ScalableEntry;
- iconEntry->dir = pixmaps;
+ iconEntry->dir = dirInfo;
iconEntry->filename = currentDir.filePath(iconName + svgext);
entries.append(iconEntry);
} else if (currentDir.exists(iconName + xpmext)) {
PixmapEntry *iconEntry = new PixmapEntry;
- iconEntry->dir = pixmaps;
+ iconEntry->dir = dirInfo;
iconEntry->filename = currentDir.filePath(iconName + xpmext);
// Notice we ensure that pixmap entries always come before
// scalable to preserve search order afterwards
Please sign in to comment.
Something went wrong with that request. Please try again.