mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-23 06:17:49 +08:00
aa0ffba768
* update everything. Let ci test if just updating is enough * fix some minor version details. * remove upstream patch * add zstdd patch and do not remove zlib since it is required for bootstrapping * add mqtt hash * webengine hash * add fixup pkgconfig to assimp * add assimp to qt-3d (still requires zlib fix) * setup pkg-config for qt * fix psql detection in configure * fix build details * fix assimp library nameing * -rpath option is not available for static builds * move config log somewhere where CI can catch it. * move logs only if they exists * append bzip2 qt-3d * break qt3d again to get logs * retry qt3d * remove qt-3d failure. everything ok now * add assistent patch for qt5-tools not building qthelp * remove unnecessary qt5-webengine patches * Remove PSQL_TYPES * [qt5-3d] remove irrxml as a assimp dep * remove unnecessary patch * fix qt-3d on windows * fix qt5-3d linux Co-authored-by: Robert Schumacher <roschuma@microsoft.com> Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
29 lines
856 B
Diff
29 lines
856 B
Diff
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
|