diff options
| author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-09-02 12:24:46 (GMT) |
|---|---|---|
| committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-09-02 12:24:46 (GMT) |
| commit | 54796e0d3150df7dd94e715c095c21fb227139ee (patch) | |
| tree | 28fbc8e03ebe3ad836b7c6ca243213da269f60ac /src/gui/image/qiconloader.cpp | |
| parent | ad229913fd89aa0a33fb9b37ac96ff63c89a05f8 (diff) | |
| parent | 9ec7bbcb96149b1ce8a2d62b55c824d71ff292a8 (diff) | |
| download | Qt-54796e0d3150df7dd94e715c095c21fb227139ee.zip Qt-54796e0d3150df7dd94e715c095c21fb227139ee.tar.gz Qt-54796e0d3150df7dd94e715c095c21fb227139ee.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into doc-4.7
Diffstat (limited to 'src/gui/image/qiconloader.cpp')
| -rw-r--r-- | src/gui/image/qiconloader.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/image/qiconloader.cpp b/src/gui/image/qiconloader.cpp index 34f40a9..0ae54fc 100644 --- a/src/gui/image/qiconloader.cpp +++ b/src/gui/image/qiconloader.cpp @@ -151,7 +151,7 @@ QStringList QIconLoader::themeSearchPaths() const { if (m_iconDirs.isEmpty()) { m_iconDirs = qt_guiPlatformPlugin()->iconThemeSearchPaths(); - // Allways add resource directory as search path + // Always add resource directory as search path m_iconDirs.append(QLatin1String(":/icons")); } return m_iconDirs; @@ -266,7 +266,7 @@ QThemeIconEntries QIconLoader::findIconHelper(const QString &themeName, PixmapEntry *iconEntry = new PixmapEntry; 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 && |