Skip to content

Commit 06b384c

Browse files
author
timlinux
committed
Set icon for qgis.exe.
Installer now works for code as in head Added installer sidebar and master image of sidebar git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5994 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 8a761d9 commit 06b384c

File tree

5 files changed

+25
-12
lines changed

5 files changed

+25
-12
lines changed

settings.pro

+3
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,9 @@ win32:QGISLIBDIR=$${DESTDIR}
101101
QGISPLUGINDIR=$${QGISBINDIR}/plugins
102102
macx:QGISPLUGINDIR=$${DESTDIR}/$${QGIS_APP_NAME}.app/Contents/plugins
103103

104+
QGISPROVIDERDIR=$${QGISBINDIR}/lib/qgis
105+
macx:QGISPROVIDERDIR=$${DESTDIR}/$${QGIS_APP_NAME}.app/Contents/lib/qgis
106+
104107
message(WORKDIR : $${WORKDIR})
105108
message(DESTDIR : $${DESTDIR})
106109
message(QGISBINDIR : $${QGISBINDIR})

src/gui/guiapp.pro

+1
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,6 @@ DESTDIR=$${QGISBINDIR}
3333
QT += qt3support svg core gui xml network
3434
message("Building libs into $${DESTDIR}")
3535

36+
win32: RC_FILE = ../../win_build/qgis.rc
3637

3738
SOURCES = main.cpp \

win_build/qgis.nsi

+21-12
Original file line numberDiff line numberDiff line change
@@ -66,24 +66,28 @@ ShowUnInstDetails show
6666

6767
Section "MainSection" SEC01
6868
SetOutPath "$INSTDIR"
69-
70-
SetOverwrite ifnewer
71-
File "C:\dev/cpp/qgis/\qgis-release\qgis_core.dll"
7269
SetOverwrite try
7370
;------- Qt
74-
;File "C:\dev/cpp/qgis/\qgis-release\QtCore4.dll"
75-
;File "C:\dev/cpp/qgis/\qgis-release\QtGui4.dll"
76-
;File "C:\dev/cpp/qgis/\qgis-release\QtNetwork4.dll"
77-
;File "C:\dev/cpp/qgis/\qgis-release\QtXml4.dll"
78-
;File "C:\dev/cpp/qgis/\qgis-release\QtSvg4.dll"
79-
;File "C:\dev/cpp/qgis/\qgis-release\mingwm10.dll"
71+
File "C:\dev\cpp\qgis\qgis-release\QtCore4.dll"
72+
File "C:\dev\cpp\qgis\qgis-release\QtGui4.dll"
73+
File "C:\dev\cpp\qgis\qgis-release\QtNetwork4.dll"
74+
File "C:\dev\cpp\qgis\qgis-release\QtXml4.dll"
75+
File "C:\dev\cpp\qgis\qgis-release\QtSvg4.dll"
76+
File "C:\dev\cpp\qgis\qgis-release\mingwm10.dll"
8077
;------- qgis Related
81-
File "C:\dev/cpp/qgis/\qgis-release\*.dll"
82-
;File "C:\dev/cpp/qgis/\qgis-release\*.exe"
78+
File "C:\dev\cpp\qgis\qgis-release\*.dll"
79+
File "C:\dev\cpp\qgis\qgis-release\*.exe"
80+
;------- proj and gdal Related
81+
File "C:\dev\cpp\qgis\qgis-release\*.csv"
82+
;subdirs
83+
File /r "C:\dev\cpp\qgis\qgis-release\lib"
84+
File /r "C:\dev\cpp\qgis\qgis-release\share"
85+
File /r "C:\dev\cpp\qgis\qgis-release\nad"
86+
8387
; Shortcuts
8488
; Next line is important - added by Tim
8589
; if its not there the application working dir will be the last used
86-
;outpath and libom wont be able to find its alg
90+
; outpath
8791
SetOutPath "$INSTDIR"
8892
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
8993
CreateDirectory "$SMPROGRAMS\$ICONS_GROUP"
@@ -153,6 +157,11 @@ Section Uninstall
153157
Delete "$INSTDIR\uninst.exe"
154158
Delete "$INSTDIR\*.exe"
155159
Delete "$INSTDIR\*.dll"
160+
Delete "$INSTDIR\*.csv"
161+
;----------------- subdirs
162+
RMDir /r "C:\dev/cpp/qgis/qgis-release/lib"
163+
RMDir /r "C:\dev/cpp/qgis/qgis-release/share"
164+
RMDir /r "C:\dev/cpp/qgis/qgis-release/nad"
156165
;----------------- icons and shortcuts
157166
Delete "$SMPROGRAMS\$ICONS_GROUP\Uninstall.lnk"
158167
Delete "$SMPROGRAMS\$ICONS_GROUP\Website.lnk"

win_build/sidebar.bmp

65.6 KB
Binary file not shown.

win_build/sidebar.xcf

140 KB
Binary file not shown.

0 commit comments

Comments
 (0)