Skip to content

Commit bf04cc0

Browse files
author
kyngchaos
committed
Mac app/window icon from resource, not xpm
git-svn-id: http://svn.osgeo.org/qgis/trunk@12583 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 79a05cf commit bf04cc0

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

src/core/qgsapplication.cpp

+8-5
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,12 @@
2323
#include <QPalette>
2424
#include <QSettings>
2525

26-
#ifndef Q_WS_WIN // (if Windows, use icon from resource)
27-
#include "../../images/themes/default/qgis.xpm" // Linux/Mac
26+
// (if Windows/Mac, use icon from resource)
27+
#if ! defined(Q_WS_WIN) && ! defined(Q_WS_MAC)
28+
#include "../../images/themes/default/qgis.xpm" // Linux
2829
#include <QIcon>
30+
#endif
31+
#ifndef Q_WS_WIN
2932
#include <netinet/in.h>
3033
#else
3134
#include <winsock.h>
@@ -65,9 +68,9 @@ QgsApplication::QgsApplication( int & argc, char ** argv, bool GUIenabled )
6568
setPrefixPath( myPrefix, true );
6669
#endif
6770

68-
// set application's icon
69-
#ifndef Q_WS_WIN // (if Windows, use icon from resource)
70-
setWindowIcon( QPixmap( qgis_xpm ) ); // Linux/Mac
71+
// set application's icon (if Windows/Mac, use icon from resource)
72+
#if ! defined(Q_WS_WIN) && ! defined(Q_WS_MAC)
73+
setWindowIcon( QPixmap( qgis_xpm ) ); // Linux
7174
#endif
7275
}
7376

0 commit comments

Comments
 (0)