Skip to content

Commit 6a60e68

Browse files
author
timlinux
committed
Use plastique style by default under windows
Build system tweaks for win / qmake git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5988 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent fa111e6 commit 6a60e68

File tree

2 files changed

+13
-0
lines changed

2 files changed

+13
-0
lines changed

settings.pro

+7
Original file line numberDiff line numberDiff line change
@@ -123,11 +123,18 @@ CONFIG(debug, debug|release){
123123
QGISPROJECTIONSELECTORLIBADD=$$member(QGISPROJECTIONSELECTORLIBADD, 0)-debug
124124
}
125125

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

133+
QGISGUILIBADD=-lqgis_gui
134+
CONFIG(debug, debug|release){
135+
QGISGUILIBADD=$$member(QGISGUILIBADD, 0)-debug
136+
}
137+
131138
win32:GDALLIBADD=-lgdal
132139
unix:GDALLIBADD=-lgdal
133140
macx:GDALLIBADD=-framework gdal

src/gui/main.cpp

+6
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#include <QString>
3131
#include <QStringList>
3232
#include <QStyle>
33+
#include <QPlastiqueStyle>
3334
#include <QTextCodec>
3435
#include <QTranslator>
3536

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

408+
#ifdef Q_WS_WIN
409+
//for windows lets use plastique syle!
410+
QApplication::setStyle(new QPlastiqueStyle);
411+
#endif
412+
407413
if(appPath.contains("/src/"))
408414
{
409415
// check to see if configure is present in the directory

0 commit comments

Comments
 (0)