[QGIS Commit] r12424 - in trunk/qgis/src: app core
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Sat Dec 12 14:51:54 EST 2009
Author: jef
Date: 2009-12-12 14:51:54 -0500 (Sat, 12 Dec 2009)
New Revision: 12424
Modified:
trunk/qgis/src/app/qgisapp.cpp
trunk/qgis/src/core/qgsapplication.cpp
Log:
apply #2273
Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp 2009-12-12 19:49:53 UTC (rev 12423)
+++ trunk/qgis/src/app/qgisapp.cpp 2009-12-12 19:51:54 UTC (rev 12424)
@@ -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 @@
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 );
Modified: trunk/qgis/src/core/qgsapplication.cpp
===================================================================
--- trunk/qgis/src/core/qgsapplication.cpp 2009-12-12 19:49:53 UTC (rev 12423)
+++ trunk/qgis/src/core/qgsapplication.cpp 2009-12-12 19:51:54 UTC (rev 12424)
@@ -23,15 +23,16 @@
#include <QPalette>
#include <QSettings>
-#include "qgsconfig.h"
-
-// for htonl
-#ifdef WIN32
+#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>
-#else
-#include <netinet/in.h>
#endif
+#include "qgsconfig.h"
+
#include <ogr_api.h>
QString QgsApplication::mPrefixPath;
@@ -63,6 +64,11 @@
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()
More information about the QGIS-commit
mailing list