[QGIS Commit] r12583 - trunk/qgis/src/core

[svn_qgis at osgeo.org]

Author: kyngchaos
Date: 2009-12-22 15:05:12 -0500 (Tue, 22 Dec 2009)
New Revision: 12583

Modified:
   trunk/qgis/src/core/qgsapplication.cpp
Log:
Mac app/window icon from resource, not xpm

Modified: trunk/qgis/src/core/qgsapplication.cpp
===================================================================
--- trunk/qgis/src/core/qgsapplication.cpp	2009-12-22 19:37:47 UTC (rev 12582)
+++ trunk/qgis/src/core/qgsapplication.cpp	2009-12-22 20:05:12 UTC (rev 12583)
@@ -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 @@
   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
 }