← Back to branch summary

~mterry/unity8/oobe-revert-geonames

« back to all changes in this revision

Viewing changes to plugins/Unity/Launcher/desktopfilehandler.cpp

  • Committer: Michael Terry
  • Date: 2016-03-11 17:51:18 UTC
  • mfrom: (1821.227.75 unity8)
  • Revision ID: michael.terry@canonical.com-20160311175118-6za2cj41c21d88ha
Merge silo 64 (soon to be trunk)

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/Unity/Launcher/desktopfilehandler.cpp
146
146
    QString iconString = settings.value(QStringLiteral("Icon")).toString();
147
147
    QString pathString = settings.value(QStringLiteral("Path")).toString();
148
148
 
149
 
    if (QFileInfo(iconString).exists()) {
 
149
    if (QFileInfo::exists(iconString)) {
150
150
        return QFileInfo(iconString).absoluteFilePath();
151
 
    } else if (QFileInfo(pathString + '/' + iconString).exists()) {
 
151
    } else if (QFileInfo::exists(pathString + '/' + iconString)) {
152
152
        return pathString + '/' + iconString;
153
153
    }
154
154
    return "image://theme/" + iconString;