diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2013-11-15 15:02:45 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2013-11-15 15:02:45 -0800 |
| commit | 06bf0e1849559e0109c419beae627b44f477dc88 (patch) | |
| tree | 35b68161c8e51871ef0cd2423d9d981663ac7d09 /subsurface-install.pri | |
| parent | 0c833ef03bc77d637cfb0ffb989a4462a56aa06e (diff) | |
| download | subsurface-06bf0e1849559e0109c419beae627b44f477dc88.tar.gz | |
Include icons in the Windows installer
Also fix the dependency / ordering issue with running makensis
Fixes #252
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'subsurface-install.pri')
| -rw-r--r-- | subsurface-install.pri | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/subsurface-install.pri b/subsurface-install.pri index 83e718754..59690f256 100644 --- a/subsurface-install.pri +++ b/subsurface-install.pri @@ -1,5 +1,6 @@ marbledir.files = $$MARBLEDIR xslt.files = $$XSLT_FILES +icons.files = $$ICONS_FILES doc.files = $$DOC_FILES translation.files = $$replace(TRANSLATIONS, .ts, .qm) qttranslation.files = $$join(QTTRANSLATIONS," "$$[QT_INSTALL_TRANSLATIONS]/,$$[QT_INSTALL_TRANSLATIONS]/) @@ -46,7 +47,7 @@ mac { MAKENSIS = /usr/bin/makensis deploy.path = $$WINDOWSSTAGING - deploy.files += $$xslt.files $$doc.files + deploy.files += $$xslt.files $$doc.files $$icons.files deploy.CONFIG += no_check_exist target.path = $$WINDOWSSTAGING marbledir.path = $$WINDOWSSTAGING/data @@ -81,8 +82,9 @@ mac { nsis.target = $$NSISFILE installer.commands += $$MAKENSIS $$NSIFILE installer.target = installer - installer.depends = nsis - install.depends += dlls nsis installer + installer.depends = nsis install + QMAKE_EXTRA_TARGETS = installer nsis + install.depends += dlls } } else { # Linux install rules |