apply #2273

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12424 c8812cc2-4d05-0410-92ff-de0c093fc19c

src/app/qgisapp.cpp

@@ -84,7 +84,6 @@
 //
 // QGIS Specific Includes
 //
-#include "../../images/themes/default/qgis.xpm"
 #include "qgisapp.h"
 #include "qgisappinterface.h"
 #include "qgis.h"
@@ -377,9 +376,6 @@ QgisApp::QgisApp( QSplashScreen *splash, QWidget * parent, Qt::WFlags fl )
   addDockWidget( Qt::LeftDockWidgetArea, mUndoWidget );
   mUndoWidget->hide();
 
-  // set application's icon
-  setWindowIcon( QPixmap( qgis_xpm ) );
-
 #ifdef Q_WS_MAC
   // action for Window menu (create before generating WindowTitleChange event))
   mWindowAction = new QAction( this );

src/core/qgsapplication.cpp

@@ -23,15 +23,16 @@
 #include <QPalette>
 #include <QSettings>
 
-#include "qgsconfig.h"
-
-// for htonl
-#ifdef WIN32
-#include <winsock.h>
-#else
+#ifndef Q_WS_WIN    // (if Windows, use icon from resource)
+#include "../../images/themes/default/qgis.xpm" // Linux/Mac
+#include <QIcon>
 #include <netinet/in.h>
+#else
+#include <winsock.h>
 #endif
 
+#include "qgsconfig.h"
+
 #include <ogr_api.h>
 
 QString QgsApplication::mPrefixPath;
@@ -63,6 +64,11 @@ QgsApplication::QgsApplication( int & argc, char ** argv, bool GUIenabled )
   QString myPrefix = myDir.absolutePath();
   setPrefixPath( myPrefix, true );
 #endif
+
+  // set application's icon
+#ifndef Q_WS_WIN       // (if Windows, use icon from resource)
+  setWindowIcon( QPixmap( qgis_xpm ) );        // Linux/Mac
+#endif
 }
 
 QgsApplication::~QgsApplication()