Skip to content

Commit 9e9b946

Browse files
committed
Update to QGIS 4.0.1 + legend crash patch
1 parent 6a8229a commit 9e9b946

File tree

4 files changed

+24
-92
lines changed

4 files changed

+24
-92
lines changed

vcpkg/ports/qgis/auth_methods.patch

Lines changed: 0 additions & 75 deletions
This file was deleted.
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
diff --git a/src/core/providers/arcgis/qgsarcgisrestquery.h b/src/core/providers/arcgis/qgsarcgisrestquery.h
2+
index 72b2c0a98e8..d50354becdf 100644
3+
--- a/src/core/providers/arcgis/qgsarcgisrestquery.h
4+
+++ b/src/core/providers/arcgis/qgsarcgisrestquery.h
5+
@@ -20,6 +20,7 @@
6+
#include "qgshttpheaders.h"
7+
#include "qgsrectangle.h"
8+
9+
+#include <QPointer>
10+
#include <QString>
11+
#include <QVariantMap>
12+
13+
@@ -234,7 +235,7 @@ class CORE_EXPORT QgsArcGisAsyncQuery : public QObject
14+
void handleReply();
15+
16+
private:
17+
- QNetworkReply *mReply = nullptr;
18+
+ QPointer<QNetworkReply> mReply;
19+
QByteArray *mResult = nullptr;
20+
};
21+

vcpkg/ports/qgis/map_renderer_background_color.patch

Lines changed: 0 additions & 13 deletions
This file was deleted.

vcpkg/ports/qgis/portfile.cmake

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
set(QGIS_REF 0858a5b304ee0d129eb159f9d00a5dc7f1b19511)
2-
set(QGIS_SHA512 1469593461076adca4fbf4f6eb13c2d519360ccbeda7b2ce7a8e80731e04b9fad3ab6b44bbce08c69ba1647662ab885338da2a4a7341b81ff9ce11553f97dc58)
1+
set(QGIS_REF 0077cb1b953386936edf3928ef7d044243ff44f5)
2+
set(QGIS_SHA512 692e14671e8a6e573cd11cf90c924624ab5362472185d7a373e3027663839a0b532ed04a81a3d8b0020d4e7740e8daf4dd78e4932ec65ca93dd07270aa987a1d)
33

44
vcpkg_from_github(
55
OUT_SOURCE_PATH SOURCE_PATH
@@ -14,8 +14,7 @@ vcpkg_from_github(
1414
include-qthread.patch
1515
processing.patch # Needed to avoid link issue with tinygltf (ATM embedded into QGIS) and _GEOSQueryCallback defined multiple times
1616
mesh.patch
17-
map_renderer_background_color.patch
18-
auth_methods.patch
17+
legend_crash.patch
1918
)
2019

2120

0 commit comments

Comments
 (0)