diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2019-08-09 14:55:26 +0300 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2019-09-16 10:34:58 +0000 |
| commit | 3190e7e0ec233222a1d4ff1d98a738b192538ba7 (patch) | |
| tree | 199d4e7d7460fdbb7fb6a7dc0e62844905ffd798 | |
| parent | f5af9c4a42f49f66cbccc71a2d13192598285f26 (diff) | |
Build IFW with Qt5.12.4 and openssl 1.1
Task-id: QTIFW-1405
Change-Id: Ic88dc96e9f729b85a538e6d8170e5c3af315d0f0
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
| -rw-r--r-- | packaging-tools/bld_ifw_tools.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/packaging-tools/bld_ifw_tools.py b/packaging-tools/bld_ifw_tools.py index 9e16c367c..111c86c3c 100644 --- a/packaging-tools/bld_ifw_tools.py +++ b/packaging-tools/bld_ifw_tools.py @@ -68,8 +68,8 @@ def get_static_qt_configure_options(openssl_dir): if platform.system().lower().startswith('win'): options += '-static-runtime ' if openssl_dir: - options += 'OPENSSL_LIBS="-lssleay32MT -llibeay32MT -lcrypt32 -lgdi32" ' - options += '-I {0}\\include -L {0}\\lib\\VC\\static '.format(openssl_dir) + options += 'OPENSSL_LIBS="-llibssl -llibcrypto -lUser32 -lWs2_32 -lAdvapi32 -lCrypt32" ' + options += '-I {0}\\include -L {0}\\lib '.format(openssl_dir) return options @@ -110,7 +110,7 @@ def get_common_qt_configure_options(): if plat.startswith('linux'): options += '-qt-xcb -no-opengl -no-icu -no-libudev ' options += '-qt-pcre -no-glib -no-egl ' - options += '-no-xinput2 -no-sm ' + options += '-no-sm ' if bldinstallercommon.is_mac_platform(): options += '-no-freetype ' return options @@ -141,7 +141,7 @@ def get_build_env(openssl_dir): ############################### class IfwOptions: - default_qt_src_pkg = 'http://download.qt.io/official_releases/qt/5.9/5.9.5/single/qt-everywhere-opensource-src-5.9.5' + ARCH_EXT + default_qt_src_pkg = 'http://download.qt.io/official_releases/qt/5.12/5.12.4/single/qt-everywhere-src-5.12.4' + ARCH_EXT default_qt_installer_framework_url = 'git://code.qt.io/installer-framework/installer-framework.git' default_qt_installer_framework_branch_qt = '3.1' default_qt_installer_framework_qmake_args = ['-r', '-config', 'release', '-config', 'static'] |