Merge pull request #3994 from cjmayo/appicon

nyalldawson · web-flow · commit 2b863b95574a · 2017-01-16T09:45:54.000+10:00
Fix application icon disappearance after removal of easter egg
diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
@@ -396,7 +396,7 @@ QString QgsApplication::activeThemePath()
 
 QString QgsApplication::appIconPath()
 {
-  return QString( "qgis-icon-60x60.png" );
+  return iconsPath() + QStringLiteral( "qgis-icon-60x60.png" );
 }
 
 QString QgsApplication::iconPath( const QString& iconFile )

Original file line number	Diff line number	Diff line change
`@@ -396,7 +396,7 @@ QString QgsApplication::activeThemePath()`
`396`	`396`
`397`	`397`	`QString QgsApplication::appIconPath()`
`398`	`398`	`{`
`399`		`- return QString( "qgis-icon-60x60.png" );`
	`399`	`+ return iconsPath() + QStringLiteral( "qgis-icon-60x60.png" );`
`400`	`400`	`}`
`401`	`401`
`402`	`402`	`QString QgsApplication::iconPath( const QString& iconFile )`