aboutsummaryrefslogtreecommitdiff
path: root/ports/qt5-tools
diff options
context:
space:
mode:
Diffstat (limited to 'ports/qt5-tools')
-rw-r--r--ports/qt5-tools/CONTROL4
-rw-r--r--ports/qt5-tools/assistant.patch28
-rw-r--r--ports/qt5-tools/portfile.cmake1
3 files changed, 2 insertions, 31 deletions
diff --git a/ports/qt5-tools/CONTROL b/ports/qt5-tools/CONTROL
index 523a608ce..bb503e7b9 100644
--- a/ports/qt5-tools/CONTROL
+++ b/ports/qt5-tools/CONTROL
@@ -1,5 +1,5 @@
Source: qt5-tools
-Version: 5.15.1
-Port-Version: 1
+Version: 5.15.2
+Port-Version: 0
Description: Qt5 Tools Module; Includes deployment tools and helpers, Qt Designer, Assistant, and other applications
Build-Depends: qt5-base[core], qt5-declarative, qt5-activeqt (windows)
diff --git a/ports/qt5-tools/assistant.patch b/ports/qt5-tools/assistant.patch
deleted file mode 100644
index b92325a23..000000000
--- a/ports/qt5-tools/assistant.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 6db2b442dd14eb068bba52e4f7223139ea29a558 Mon Sep 17 00:00:00 2001
-From: Jarek Kobus <jaroslaw.kobus@qt.io>
-Date: Mon, 7 Sep 2020 14:37:33 +0200
-Subject: [PATCH] Fix static build of assistant
-
-Fixes: QTBUG-86477
-Pick-to: 5.15
-Change-Id: Ifb77fb38b4b182a996666c6b69d8357458add0c4
-Reviewed-by: Kai Koehne <kai.koehne@qt.io>
----
- src/src.pro | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/src.pro b/src/src.pro
-index 8c75a8cd8..24d0b9c6b 100644
---- a/src/src.pro
-+++ b/src/src.pro
-@@ -9,7 +9,7 @@ qtHaveModule(widgets) {
- SUBDIRS = designer \
- pixeltool
-
-- !static|contains(QT_PLUGINS, qtsqlite): SUBDIRS += assistant
-+ !static|contains(QT_PLUGINS, qsqlite): SUBDIRS += assistant
-
- linguist.depends = designer
- }
---
-2.16.3
diff --git a/ports/qt5-tools/portfile.cmake b/ports/qt5-tools/portfile.cmake
index 7b0b32ac2..c166ed7f5 100644
--- a/ports/qt5-tools/portfile.cmake
+++ b/ports/qt5-tools/portfile.cmake
@@ -1,7 +1,6 @@
include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
qt_submodule_installation(PATCHES
- assistant.patch
icudt-debug-suffix.patch # https://bugreports.qt.io/browse/QTBUG-87677
)