mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Allow cross-building 64 bit binaries for Windows

Browse source 
This also makes sure that we package the Qt5 translations, not the Qt4
translations.

There was an odd issue that somehow a 32bit search path ended up being
used by win-dll which resulted in the wrong DLLs being packaged.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-08-02 15:06:10 -07:00
parent a104905257
commit 6c15647858
4 changed files with 28 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
subsurface-install.pri
View file

@ -4,10 +4,10 @@ theme.files = $$THEME_FILES
translation.files = $$replace(TRANSLATIONS, .ts, .qm)
exists($$[QT_INSTALL_TRANSLATIONS]) {
qt_translation_dir = $$[QT_INSTALL_TRANSLATIONS]
} else: exists(/usr/share/qt4/translations) {
} else: exists(/usr/share/qt5/translations) {
# On some cross-compilation environments, the translations are either missing or not
# where they're expected to be. In such cases, try copying from the system.
qt_translation_dir = /usr/share/qt4/translations
qt_translation_dir = /usr/share/qt5/translations
}
# Prepend the Qt translation dir so we can actually find the files