Skip to content

Commit 8e0fead

Browse files
author
jef
committed
apply #2273
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12424 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent ba12c03 commit 8e0fead

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

src/app/qgisapp.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@
8484
//
8585
// QGIS Specific Includes
8686
//
87-
#include "../../images/themes/default/qgis.xpm"
8887
#include "qgisapp.h"
8988
#include "qgisappinterface.h"
9089
#include "qgis.h"
@@ -377,9 +376,6 @@ QgisApp::QgisApp( QSplashScreen *splash, QWidget * parent, Qt::WFlags fl )
377376
addDockWidget( Qt::LeftDockWidgetArea, mUndoWidget );
378377
mUndoWidget->hide();
379378

380-
// set application's icon
381-
setWindowIcon( QPixmap( qgis_xpm ) );
382-
383379
#ifdef Q_WS_MAC
384380
// action for Window menu (create before generating WindowTitleChange event))
385381
mWindowAction = new QAction( this );

src/core/qgsapplication.cpp

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,16 @@
2323
#include <QPalette>
2424
#include <QSettings>
2525

26-
#include "qgsconfig.h"
27-
28-
// for htonl
29-
#ifdef WIN32
30-
#include <winsock.h>
31-
#else
26+
#ifndef Q_WS_WIN // (if Windows, use icon from resource)
27+
#include "../../images/themes/default/qgis.xpm" // Linux/Mac
28+
#include <QIcon>
3229
#include <netinet/in.h>
30+
#else
31+
#include <winsock.h>
3332
#endif
3433

34+
#include "qgsconfig.h"
35+
3536
#include <ogr_api.h>
3637

3738
QString QgsApplication::mPrefixPath;
@@ -63,6 +64,11 @@ QgsApplication::QgsApplication( int & argc, char ** argv, bool GUIenabled )
6364
QString myPrefix = myDir.absolutePath();
6465
setPrefixPath( myPrefix, true );
6566
#endif
67+
68+
// set application's icon
69+
#ifndef Q_WS_WIN // (if Windows, use icon from resource)
70+
setWindowIcon( QPixmap( qgis_xpm ) ); // Linux/Mac
71+
#endif
6672
}
6773

6874
QgsApplication::~QgsApplication()

0 commit comments

Comments
 (0)