[PATCH] Don't install the actual icon files
Thiago Macieira
thiago at macieira.org
Wed Dec 11 19:07:18 UTC 2013
They are loaded into a Qt resource and always accessed via it.
Signed-off-by: Thiago Macieira <thiago at macieira.org>
---
packaging/windows/subsurface.nsi.in | 2 --
subsurface-install.pri | 3 ---
2 files changed, 5 deletions(-)
diff --git a/packaging/windows/subsurface.nsi.in b/packaging/windows/subsurface.nsi.in
index b5722da..b29d872 100644
--- a/packaging/windows/subsurface.nsi.in
+++ b/packaging/windows/subsurface.nsi.in
@@ -101,7 +101,6 @@ Section
File subsurface.exe
File /r data
File /r images
- File /r icons
File /r plugins
File /r Documentation
File /r translations
@@ -162,7 +161,6 @@ Section "Uninstall"
Delete "$INSTDIR\qt.conf"
RMDir /r "$INSTDIR\share"
RMDir /r "$INSTDIR\data"
- RMDir /r "$INSTDIR\icons"
RMDir /r "$INSTDIR\images"
RMDir /r "$INSTDIR\translations"
RMDir /r "$INSTDIR\oldshare"
diff --git a/subsurface-install.pri b/subsurface-install.pri
index 88f28e7..19b0fd9 100644
--- a/subsurface-install.pri
+++ b/subsurface-install.pri
@@ -1,5 +1,4 @@
marbledir.files = $$MARBLEDIR
-icons.files = $$ICONS_FILES
doc.files = $$DOC_FILES
translation.files = $$replace(TRANSLATIONS, .ts, .qm)
exists($$[QT_INSTALL_TRANSLATIONS]) {
@@ -54,7 +53,6 @@ mac {
doc.path = $$WINDOWSSTAGING/Documentation
CONFIG -= copy_dir_files
deploy.path = $$WINDOWSSTAGING
- deploy.files += $$icons.files
deploy.CONFIG += no_check_exist
target.path = $$WINDOWSSTAGING
marbledir.path = $$WINDOWSSTAGING/data
@@ -132,7 +130,6 @@ BINDIR = $(prefix)/bin$${nl}\
DATADIR = $(prefix)/share$${nl}\
DOCDIR = $(DATADIR)/doc/subsurface$${nl}\
DESKTOPDIR = $(DATADIR)/applications$${nl}\
-ICONPATH = $(DATADIR)/icons/hicolor$${nl}\
ICONDIR = $(ICONPATH)/scalable/apps$${nl}\
MANDIR = $(DATADIR)/man/man1$${nl}\
QMAKE_EXTRA_TARGETS += dummy
--
1.7.11.7
More information about the subsurface
mailing list