diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2020-05-26 11:56:43 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2020-05-26 12:12:41 (GMT) |
| commit | e00266aad469c79ed557b7829c4e3548d7658c22 (patch) | |
| tree | 2d7b716753c05477df1c9446db11f0fff61240b0 | |
| parent | 371bde79b95cd2c11672e109d94131f9df4e4a1b (diff) | |
| download | mxe-e00266aad469c79ed557b7829c4e3548d7658c22.zip mxe-e00266aad469c79ed557b7829c4e3548d7658c22.tar.gz mxe-e00266aad469c79ed557b7829c4e3548d7658c22.tar.bz2 | |
update qtifw
| -rw-r--r-- | src/qtifw-1-fixes.patch | 33 | ||||
| -rw-r--r-- | src/qtifw.mk | 4 |
2 files changed, 3 insertions, 34 deletions
diff --git a/src/qtifw-1-fixes.patch b/src/qtifw-1-fixes.patch index 7d8ae9b..5f2f883 100644 --- a/src/qtifw-1-fixes.patch +++ b/src/qtifw-1-fixes.patch @@ -5,7 +5,7 @@ Contains ad hoc patches for cross building. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tony Theodore <tonyt@logyst.com> Date: Sun, 19 Jan 2020 13:27:42 +1100 -Subject: [PATCH 1/2] fixes +Subject: [PATCH 1/1] fixes diff --git a/installerfw.pro b/installerfw.pro @@ -82,34 +82,3 @@ index 1111111..2222222 100644 namespace QInstaller { - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Tony Theodore <tonyt@logyst.com> -Date: Sun, 19 Jan 2020 13:28:53 +1100 -Subject: [PATCH 2/2] fixes for Qt 5.14 update - - -diff --git a/src/libs/installer/component.cpp b/src/libs/installer/component.cpp -index 1111111..2222222 100644 ---- a/src/libs/installer/component.cpp -+++ b/src/libs/installer/component.cpp -@@ -50,7 +50,6 @@ - - #include <QtUiTools/QUiLoader> - --#include <private/qv8engine_p.h> - #include <private/qv4scopedvalue_p.h> - #include <private/qv4object_p.h> - -diff --git a/src/libs/installer/extractarchiveoperation.cpp b/src/libs/installer/extractarchiveoperation.cpp -index 1111111..2222222 100644 ---- a/src/libs/installer/extractarchiveoperation.cpp -+++ b/src/libs/installer/extractarchiveoperation.cpp -@@ -30,6 +30,7 @@ - - #include "constants.h" - -+#include <QDataStream> - #include <QEventLoop> - #include <QThreadPool> - #include <QFileInfo> diff --git a/src/qtifw.mk b/src/qtifw.mk index 542a91c..20a85f2 100644 --- a/src/qtifw.mk +++ b/src/qtifw.mk @@ -4,8 +4,8 @@ PKG := qtifw $(PKG)_WEBSITE := https://doc.qt.io/qtinstallerframework/index.html $(PKG)_DESCR := Qt Installer Framework $(PKG)_IGNORE := -$(PKG)_VERSION := 3.2.0 -$(PKG)_CHECKSUM := 7cd0d7b86fbe63b101f263b6532485df3a2d336cc0026b47eb866dae134e319f +$(PKG)_VERSION := 3.2.2 +$(PKG)_CHECKSUM := d4793b891acaa06938e4bfc5367e024bc132108f819b48da0e8a97feab555ce9 $(PKG)_FILE := qtifw-$($(PKG)_VERSION).tar $(PKG)_URL := https://download.qt.io/official_releases/qt-installer-framework/$($(PKG)_VERSION)/qt-installer-framework-opensource-src-$($(PKG)_VERSION).tar.gz $(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS) |