diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2021-01-20 21:55:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-20 12:55:41 -0800 |
| commit | 8e926cc06c3b52056926697b87fc350af7e66d69 (patch) | |
| tree | a22c33d961a95d9e8c267e1d3d08dc194d5b8703 /ports/qt5-tools/assistant.patch | |
| parent | a8a07972dbd6a835329f31133fb83b3f4723cb55 (diff) | |
| download | vcpkg-8e926cc06c3b52056926697b87fc350af7e66d69.tar.gz vcpkg-8e926cc06c3b52056926697b87fc350af7e66d69.zip | |
[qt5] Update to 5.15.2 (#14678)
* [qt5] Update to 5.15.2
(mqtt currently missing git tag)
* deactivate update of ports
* update version
* reduce port version
* fix typo
* fix patch for linux missing pthread
* fix qt5-tools
* fix qt5-webengine
* add xcb-util to linux provisioning script
* fix version numbers
* fix other typo
* remove new hashes file
* fix latest version info
* switch to vcpkg_from_git
adjust vcpkg_from_git to handle tags.
add OUT_REF for vcpkg_from_git to enable scriptable update of ports
* regenerate docs
* [vcpkg_from_git] new options TAG and OUT_REF
- TAG github tag to checkout
- OUT_REF github commit id related to tag or ref
(useable for automatic updates of ports if used with a version tag)
* Apply suggestions from code review
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
* additional changes due to CR
* regenerate docs
* Remove 'Port-Version:0' from qt5-location
Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>
* add all those versions
* fix versions
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>
Diffstat (limited to 'ports/qt5-tools/assistant.patch')
| -rw-r--r-- | ports/qt5-tools/assistant.patch | 28 |
1 files changed, 0 insertions, 28 deletions
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
|