Skip to content

Commit

Permalink
Use plastique style by default under windows
Browse files Browse the repository at this point in the history
Build system tweaks for win / qmake

git-svn-id: http://svn.osgeo.org/qgis/trunk@5988 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
timlinux committed Oct 21, 2006
1 parent a1c9d57 commit 02dc16d
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 0 deletions.
7 changes: 7 additions & 0 deletions settings.pro
Original file line number Diff line number Diff line change
Expand Up @@ -123,11 +123,18 @@ CONFIG(debug, debug|release){
QGISPROJECTIONSELECTORLIBADD=$$member(QGISPROJECTIONSELECTORLIBADD, 0)-debug
}

#not currently used since I had to incorporate composer into gui lib due to
#cyclical dependency issues
QGISCOMPOSERLIBADD=-lqgis_composer
CONFIG(debug, debug|release){
QGISCOMPOSERLIBADD=$$member(QGISCOMPOSERLIBADD, 0)-debug
}

QGISGUILIBADD=-lqgis_gui
CONFIG(debug, debug|release){
QGISGUILIBADD=$$member(QGISGUILIBADD, 0)-debug
}

win32:GDALLIBADD=-lgdal
unix:GDALLIBADD=-lgdal
macx:GDALLIBADD=-framework gdal
Expand Down
6 changes: 6 additions & 0 deletions src/gui/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
#include <QString>
#include <QStringList>
#include <QStyle>
#include <QPlastiqueStyle>
#include <QTextCodec>
#include <QTranslator>

Expand Down Expand Up @@ -404,6 +405,11 @@ int main(int argc, char *argv[])
QString testFile = "lt-qgis";
#endif

#ifdef Q_WS_WIN
//for windows lets use plastique syle!
QApplication::setStyle(new QPlastiqueStyle);
#endif

if(appPath.contains("/src/"))
{
// check to see if configure is present in the directory
Expand Down

0 comments on commit 02dc16d

Please sign in to comment.