diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2014-08-02 15:06:10 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2014-08-02 15:08:22 -0700 |
| commit | 6c15647858e866d1366de57f49e52a4a2b69aa0f (patch) | |
| tree | e2f4a7829d2f1556c40b4c1294ed73bfd625e754 /subsurface-install.pri | |
| parent | a104905257876b8b25c5ff06f1fc41f8f87ee34f (diff) | |
| download | subsurface-6c15647858e866d1366de57f49e52a4a2b69aa0f.tar.gz | |
Allow cross-building 64 bit binaries for Windows
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>
Diffstat (limited to 'subsurface-install.pri')
| -rw-r--r-- | subsurface-install.pri | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/subsurface-install.pri b/subsurface-install.pri index 0fec89d32..c06f5bd30 100644 --- a/subsurface-install.pri +++ b/subsurface-install.pri @@ -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 |