Skip to content
Permalink
Browse files

Mac app/window icon from resource, not xpm

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12583 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
kyngchaos
kyngchaos committed Dec 22, 2009
1 parent c52a317 commit 8173f5d58d1188cf0de90cecfc54e339a02f5e49
Showing with 8 additions and 5 deletions.
  1. +8 −5 src/core/qgsapplication.cpp
@@ -23,9 +23,12 @@
#include <QPalette>
#include <QSettings>

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

// set application's icon
#ifndef Q_WS_WIN // (if Windows, use icon from resource)
setWindowIcon( QPixmap( qgis_xpm ) ); // Linux/Mac
// set application's icon (if Windows/Mac, use icon from resource)
#if ! defined(Q_WS_WIN) && ! defined(Q_WS_MAC)
setWindowIcon( QPixmap( qgis_xpm ) ); // Linux
#endif
}

0 comments on commit 8173f5d

Please sign in to comment.
You can’t perform that action at this time.