1 |
commit: 8e871b28114deab128c97103f0f7743fe6b6d7ff |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Oct 27 21:40:35 2017 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 28 07:40:42 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e871b28 |
7 |
|
8 |
sci-geosciences/qgis: Drop obsolete patches |
9 |
|
10 |
Package-Manager: Portage-2.3.12, Repoman-2.3.4 |
11 |
|
12 |
.../qgis/files/qgis-2.18.3-app-icon.patch | 13 -- |
13 |
.../qgis/files/qgis-2.18.3-qscintilla-2.10.patch | 24 --- |
14 |
.../qgis/files/qgis-2.18.3-sip-4.19.1.patch | 42 ---- |
15 |
.../qgis/files/qgis-2.18.3-sip-4.19.patch | 237 --------------------- |
16 |
.../qgis/files/qgis-2.18.3-webkit.patch | 112 ---------- |
17 |
5 files changed, 428 deletions(-) |
18 |
|
19 |
diff --git a/sci-geosciences/qgis/files/qgis-2.18.3-app-icon.patch b/sci-geosciences/qgis/files/qgis-2.18.3-app-icon.patch |
20 |
deleted file mode 100644 |
21 |
index 88db963bcaf..00000000000 |
22 |
--- a/sci-geosciences/qgis/files/qgis-2.18.3-app-icon.patch |
23 |
+++ /dev/null |
24 |
@@ -1,13 +0,0 @@ |
25 |
-diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp |
26 |
-index 4cdb07e..76ffc09 100644 |
27 |
---- a/src/core/qgsapplication.cpp |
28 |
-+++ b/src/core/qgsapplication.cpp |
29 |
-@@ -396,7 +396,7 @@ QString QgsApplication::activeThemePath() |
30 |
- |
31 |
- QString QgsApplication::appIconPath() |
32 |
- { |
33 |
-- return QString( "qgis-icon-60x60.png" ); |
34 |
-+ return iconsPath() + QStringLiteral( "qgis-icon-60x60.png" ); |
35 |
- } |
36 |
- |
37 |
- QString QgsApplication::iconPath( const QString& iconFile ) |
38 |
|
39 |
diff --git a/sci-geosciences/qgis/files/qgis-2.18.3-qscintilla-2.10.patch b/sci-geosciences/qgis/files/qgis-2.18.3-qscintilla-2.10.patch |
40 |
deleted file mode 100644 |
41 |
index fb714654579..00000000000 |
42 |
--- a/sci-geosciences/qgis/files/qgis-2.18.3-qscintilla-2.10.patch |
43 |
+++ /dev/null |
44 |
@@ -1,24 +0,0 @@ |
45 |
-From 30577386cbe0ee9a5509e7f6f54df2c1194153ee Mon Sep 17 00:00:00 2001 |
46 |
-From: Larry Shaffer <lshaffer@××××××××××××.com> |
47 |
-Date: Thu, 2 Mar 2017 15:00:18 -0700 |
48 |
-Subject: [PATCH] Followup to dfe268f; update QScintilla new lib name in 2.10 |
49 |
- for Qt4 |
50 |
- |
51 |
-[ci skip] |
52 |
---- |
53 |
- cmake/FindQScintilla.cmake | 2 +- |
54 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
55 |
- |
56 |
-diff --git a/cmake/FindQScintilla.cmake b/cmake/FindQScintilla.cmake |
57 |
-index 7f97624..2f87e4c 100644 |
58 |
---- a/cmake/FindQScintilla.cmake |
59 |
-+++ b/cmake/FindQScintilla.cmake |
60 |
-@@ -36,7 +36,7 @@ ELSE(EXISTS QSCINTILLA_VERSION_STR) |
61 |
- if(ENABLE_QT5) |
62 |
- set(QSCINTILLA_LIBRARY_NAMES qscintilla2-qt5 qscintilla2_qt5 libqt5scintilla2 libqscintilla2-qt5 qt5scintilla2 libqscintilla2-qt5.dylib) |
63 |
- else(ENABLE_QT5) |
64 |
-- set(QSCINTILLA_LIBRARY_NAMES qscintilla2 libqscintilla2 libqscintilla2.dylib) |
65 |
-+ set(QSCINTILLA_LIBRARY_NAMES qscintilla2 qscintilla2_qt4 libqscintilla2 libqscintilla2.dylib) |
66 |
- endif(ENABLE_QT5) |
67 |
- |
68 |
- find_library(QSCINTILLA_LIBRARY |
69 |
|
70 |
diff --git a/sci-geosciences/qgis/files/qgis-2.18.3-sip-4.19.1.patch b/sci-geosciences/qgis/files/qgis-2.18.3-sip-4.19.1.patch |
71 |
deleted file mode 100644 |
72 |
index ff8989227f6..00000000000 |
73 |
--- a/sci-geosciences/qgis/files/qgis-2.18.3-sip-4.19.1.patch |
74 |
+++ /dev/null |
75 |
@@ -1,42 +0,0 @@ |
76 |
-From 85a0db24f32351f6096cd8282f03ad5c2f4e6ef5 Mon Sep 17 00:00:00 2001 |
77 |
-From: Sandro Mani <manisandro@×××××.com> |
78 |
-Date: Wed, 1 Mar 2017 16:12:38 +0100 |
79 |
-Subject: [PATCH] Fix build against recent sip/PyQt4: |
80 |
- |
81 |
-qgsfiledownloader.sip:33:0: |
82 |
-src/gui/qgsfiledownloader.h:94:5: error: overriding non-deleted function 'virtual QgsFileDownloader::~QgsFileDownloader()' |
83 |
- |
84 |
-RuntimeError: qgis._core cannot import type 'QList<QVariant>' from PyQt4.QtCore |
85 |
---- |
86 |
- python/core/core.sip | 1 + |
87 |
- src/gui/qgsfiledownloader.h | 4 +++- |
88 |
- 2 files changed, 4 insertions(+), 1 deletion(-) |
89 |
- |
90 |
-diff --git a/python/core/core.sip b/python/core/core.sip |
91 |
-index 8f0b6af..41f5450 100644 |
92 |
---- a/python/core/core.sip |
93 |
-+++ b/python/core/core.sip |
94 |
-@@ -3,6 +3,7 @@ |
95 |
- |
96 |
- %Feature QT5_SUPPORT |
97 |
- |
98 |
-+%Import QtCore/QtCoremod.sip |
99 |
- %Import QtXml/QtXmlmod.sip |
100 |
- %Import QtNetwork/QtNetworkmod.sip |
101 |
- %Import QtSql/QtSqlmod.sip |
102 |
-diff --git a/src/gui/qgsfiledownloader.h b/src/gui/qgsfiledownloader.h |
103 |
-index c9276f7..841e4b6 100644 |
104 |
---- a/src/gui/qgsfiledownloader.h |
105 |
-+++ b/src/gui/qgsfiledownloader.h |
106 |
-@@ -90,8 +90,10 @@ class GUI_EXPORT QgsFileDownloader : public QObject |
107 |
- void onSslErrors( QNetworkReply *reply, const QList<QSslError> &errors ); |
108 |
- #endif |
109 |
- |
110 |
-- private: |
111 |
-+ protected: |
112 |
- ~QgsFileDownloader(); |
113 |
-+ |
114 |
-+ private: |
115 |
- /** |
116 |
- * Abort current request and show an error if the instance has GUI |
117 |
- * notifications enabled. |
118 |
|
119 |
diff --git a/sci-geosciences/qgis/files/qgis-2.18.3-sip-4.19.patch b/sci-geosciences/qgis/files/qgis-2.18.3-sip-4.19.patch |
120 |
deleted file mode 100644 |
121 |
index f72e0e4fd17..00000000000 |
122 |
--- a/sci-geosciences/qgis/files/qgis-2.18.3-sip-4.19.patch |
123 |
+++ /dev/null |
124 |
@@ -1,237 +0,0 @@ |
125 |
-commit 718581ffb12b723f9a3c0ae01b7ec2d8aed9d4bb |
126 |
-Author: Juergen E. Fischer <jef@××××××.de> |
127 |
-Date: Sat Feb 11 21:02:05 2017 +0100 |
128 |
- |
129 |
- adapt bindings to sip 4.19 (fixes #16071) |
130 |
- |
131 |
-diff --git a/python/analysis/analysis.sip b/python/analysis/analysis.sip |
132 |
-index ceb5056..bd90e10 100644 |
133 |
---- a/python/analysis/analysis.sip |
134 |
-+++ b/python/analysis/analysis.sip |
135 |
-@@ -1,5 +1,4 @@ |
136 |
- %Module(name=qgis._analysis, |
137 |
-- version=0, |
138 |
- keyword_arguments="Optional") |
139 |
- |
140 |
- %Import QtCore/QtCoremod.sip |
141 |
-diff --git a/python/analysis/network/networkanalysis.sip b/python/analysis/network/networkanalysis.sip |
142 |
-index fb446d1..d2c192b 100644 |
143 |
---- a/python/analysis/network/networkanalysis.sip |
144 |
-+++ b/python/analysis/network/networkanalysis.sip |
145 |
-@@ -1,5 +1,4 @@ |
146 |
- %Module(name=qgis._networkanalysis, |
147 |
-- version=0, |
148 |
- keyword_arguments="Optional") |
149 |
- |
150 |
- %Import QtCore/QtCoremod.sip |
151 |
-diff --git a/python/core/conversions.sip b/python/core/conversions.sip |
152 |
-index 564d4de..f07d3ab 100644 |
153 |
---- a/python/core/conversions.sip |
154 |
-+++ b/python/core/conversions.sip |
155 |
-@@ -747,7 +747,7 @@ template<TYPE> |
156 |
- |
157 |
- // QMap<qint64, TYPE> is implemented as a Python dictionary. |
158 |
- template<TYPE> |
159 |
--%MappedType QMap<qint64, TYPE> /DocType="dict-of-qint64-TYPE"/ |
160 |
-+%MappedType QMap<qint64, TYPE> |
161 |
- { |
162 |
- %TypeHeaderCode |
163 |
- #include <qmap.h> |
164 |
-@@ -1873,7 +1873,7 @@ template <TYPE> |
165 |
- }; |
166 |
- |
167 |
- // QList<QgsField> is implemented as a Python list of QgsField. |
168 |
--%MappedType QList<QgsField> /DocType="list-of-qgsfield"/ |
169 |
-+%MappedType QList<QgsField> |
170 |
- { |
171 |
- %TypeHeaderCode |
172 |
- #include <qgsfield.h> |
173 |
-@@ -1978,7 +1978,7 @@ template <TYPE> |
174 |
- |
175 |
- %If (QVECTORINT_CONVERSION) |
176 |
- // QVector<int> is implemented as a Python list of integers. |
177 |
--%MappedType QVector<int> /DocType="list-of-int"/ |
178 |
-+%MappedType QVector<int> |
179 |
- { |
180 |
- %TypeHeaderCode |
181 |
- #include <qvector.h> |
182 |
-diff --git a/python/core/core.sip b/python/core/core.sip |
183 |
-index 577c4c1..8f0b6af 100644 |
184 |
---- a/python/core/core.sip |
185 |
-+++ b/python/core/core.sip |
186 |
-@@ -1,5 +1,4 @@ |
187 |
- %Module(name=qgis._core, |
188 |
-- version=0, |
189 |
- keyword_arguments="Optional") |
190 |
- |
191 |
- %Feature QT5_SUPPORT |
192 |
-diff --git a/python/core/qgscoordinatetransform.sip b/python/core/qgscoordinatetransform.sip |
193 |
-index c14ba53..f9b7854 100644 |
194 |
---- a/python/core/qgscoordinatetransform.sip |
195 |
-+++ b/python/core/qgscoordinatetransform.sip |
196 |
-@@ -15,6 +15,7 @@ |
197 |
- class QgsCoordinateTransform : QObject |
198 |
- { |
199 |
- %TypeHeaderCode |
200 |
-+extern PyObject *sipExportedExceptions__core[2]; // workaround: sipExportedExceptions__core is only defined in the first sip part |
201 |
- #include <qgscoordinatetransform.h> |
202 |
- %End |
203 |
- |
204 |
-@@ -215,5 +216,5 @@ class QgsCoordinateTransform : QObject |
205 |
- |
206 |
- signals: |
207 |
- /** Signal when an invalid pj_transform() has occurred */ |
208 |
-- void invalidTransformInput() const; |
209 |
-+ void invalidTransformInput() const; |
210 |
- }; |
211 |
-diff --git a/python/core/qgsfeature.sip b/python/core/qgsfeature.sip |
212 |
-index 596f8a8..4009b50 100644 |
213 |
---- a/python/core/qgsfeature.sip |
214 |
-+++ b/python/core/qgsfeature.sip |
215 |
-@@ -4,7 +4,7 @@ typedef QMap<int, QVariant> QgsAttributeMap; |
216 |
- typedef QVector<QVariant> QgsAttributes; |
217 |
- |
218 |
- // QgsAttributes is implemented as a Python list of Python objects. |
219 |
--%MappedType QgsAttributes /DocType="list-of-attributes"/ |
220 |
-+%MappedType QgsAttributes |
221 |
- { |
222 |
- %TypeHeaderCode |
223 |
- #include <qgsfeature.h> |
224 |
-diff --git a/python/core/qgspallabeling.sip b/python/core/qgspallabeling.sip |
225 |
-index 488b58b..3d99555 100644 |
226 |
---- a/python/core/qgspallabeling.sip |
227 |
-+++ b/python/core/qgspallabeling.sip |
228 |
-@@ -1,5 +1,5 @@ |
229 |
- // QMap<QgsPalLayerSettings::DataDefinedProperties, QgsDataDefined*> is implemented as a Python dictionary. |
230 |
--%MappedType QMap<QgsPalLayerSettings::DataDefinedProperties, QgsDataDefined*> /DocType="dict-of-QgsPalLayerSettings.DataDefinedProperties-QgsDataDefined*"/ |
231 |
-+%MappedType QMap<QgsPalLayerSettings::DataDefinedProperties, QgsDataDefined*> |
232 |
- { |
233 |
- %TypeHeaderCode |
234 |
- #include <qmap.h> |
235 |
-diff --git a/python/core/qgsvectorlayerfeatureiterator.sip b/python/core/qgsvectorlayerfeatureiterator.sip |
236 |
-index 0685e20..ad3431c 100644 |
237 |
---- a/python/core/qgsvectorlayerfeatureiterator.sip |
238 |
-+++ b/python/core/qgsvectorlayerfeatureiterator.sip |
239 |
-@@ -70,5 +70,6 @@ class QgsVectorLayerFeatureIterator : QgsAbstractFeatureIterator |
240 |
- //void updateFeatureGeometry( QgsFeature& f ); |
241 |
- |
242 |
- private: |
243 |
-- QgsVectorLayerFeatureIterator(); |
244 |
-+ QgsVectorLayerFeatureIterator( const QgsVectorLayerFeatureIterator &rhs ); |
245 |
-+ |
246 |
- }; |
247 |
-diff --git a/python/core/raster/qgsrasterprojector.sip b/python/core/raster/qgsrasterprojector.sip |
248 |
-index 47bb697..40b9a10 100644 |
249 |
---- a/python/core/raster/qgsrasterprojector.sip |
250 |
-+++ b/python/core/raster/qgsrasterprojector.sip |
251 |
-@@ -55,7 +55,7 @@ class QgsRasterProjector : QgsRasterInterface |
252 |
- |
253 |
- int bandCount() const; |
254 |
- |
255 |
-- int dataType( int bandNo ) const; |
256 |
-+ QGis::DataType dataType( int bandNo ) const; |
257 |
- |
258 |
- /** \brief set source and destination CRS */ |
259 |
- void setCRS( const QgsCoordinateReferenceSystem & theSrcCRS, const QgsCoordinateReferenceSystem & theDestCRS, |
260 |
-diff --git a/python/gui/editorwidgets/qgsdatetimeedit.sip b/python/gui/editorwidgets/qgsdatetimeedit.sip |
261 |
-index deda76d..be658a1 100644 |
262 |
---- a/python/gui/editorwidgets/qgsdatetimeedit.sip |
263 |
-+++ b/python/gui/editorwidgets/qgsdatetimeedit.sip |
264 |
-@@ -37,6 +37,7 @@ class QgsDateTimeEdit : QDateTimeEdit |
265 |
- |
266 |
- protected: |
267 |
- virtual void resizeEvent( QResizeEvent* event ); |
268 |
-- |
269 |
- void mousePressEvent( QMouseEvent*event ); |
270 |
-+ virtual void fixup(QString & input) const; |
271 |
-+ virtual QValidator::State validate(QString &text, int &pos) const; |
272 |
- }; |
273 |
-diff --git a/python/gui/editorwidgets/qgsdoublespinbox.sip b/python/gui/editorwidgets/qgsdoublespinbox.sip |
274 |
-index 1666a02..58f589d 100644 |
275 |
---- a/python/gui/editorwidgets/qgsdoublespinbox.sip |
276 |
-+++ b/python/gui/editorwidgets/qgsdoublespinbox.sip |
277 |
-@@ -80,4 +80,5 @@ class QgsDoubleSpinBox : QDoubleSpinBox |
278 |
- protected: |
279 |
- virtual void changeEvent( QEvent* event ); |
280 |
- virtual void paintEvent( QPaintEvent* event ); |
281 |
-+ virtual void fixup(QString & input) const; |
282 |
- }; |
283 |
-diff --git a/python/gui/editorwidgets/qgsspinbox.sip b/python/gui/editorwidgets/qgsspinbox.sip |
284 |
-index d560641..c953470 100644 |
285 |
---- a/python/gui/editorwidgets/qgsspinbox.sip |
286 |
-+++ b/python/gui/editorwidgets/qgsspinbox.sip |
287 |
-@@ -78,7 +78,7 @@ class QgsSpinBox : QSpinBox |
288 |
- virtual QValidator::State validate( QString & input, int & pos ) const; |
289 |
- |
290 |
- protected: |
291 |
-- |
292 |
- virtual void changeEvent( QEvent* event ); |
293 |
- virtual void paintEvent( QPaintEvent* event ); |
294 |
-+ virtual void fixup(QString &input) const; |
295 |
- }; |
296 |
-diff --git a/python/gui/gui.sip b/python/gui/gui.sip |
297 |
-index 240c636..727ac70 100644 |
298 |
---- a/python/gui/gui.sip |
299 |
-+++ b/python/gui/gui.sip |
300 |
-@@ -1,5 +1,4 @@ |
301 |
- %Module(name=qgis._gui, |
302 |
-- version=0, |
303 |
- keyword_arguments="Optional") |
304 |
- |
305 |
- %Feature HAVE_QSCI_SIP |
306 |
-diff --git a/python/gui/qgslonglongvalidator.sip b/python/gui/qgslonglongvalidator.sip |
307 |
-index 9def830..7500357 100644 |
308 |
---- a/python/gui/qgslonglongvalidator.sip |
309 |
-+++ b/python/gui/qgslonglongvalidator.sip |
310 |
-@@ -8,7 +8,7 @@ class QgsLongLongValidator : QValidator |
311 |
- QgsLongLongValidator( qint64 bottom, qint64 top, QObject *parent ); |
312 |
- ~QgsLongLongValidator(); |
313 |
- |
314 |
-- QValidator::State validate( QString &input, int& ) const; |
315 |
-+ virtual QValidator::State validate( QString &input, int& ) const; |
316 |
- |
317 |
- void setBottom( qint64 bottom ); |
318 |
- void setTop( qint64 top ); |
319 |
-@@ -17,4 +17,6 @@ class QgsLongLongValidator : QValidator |
320 |
- |
321 |
- qint64 bottom() const; |
322 |
- qint64 top() const; |
323 |
-+ |
324 |
-+ virtual void fixup(QString &input) const; |
325 |
- }; |
326 |
-diff --git a/python/server/qgswmsconfigparser.sip b/python/server/qgswmsconfigparser.sip |
327 |
-index f05752c..d231637 100644 |
328 |
---- a/python/server/qgswmsconfigparser.sip |
329 |
-+++ b/python/server/qgswmsconfigparser.sip |
330 |
-@@ -115,7 +115,7 @@ class QgsWMSConfigParser |
331 |
- virtual void setScaleDenominator( double denom ) = 0; |
332 |
- virtual void addExternalGMLData( const QString& layerName, QDomDocument* gmlDoc ) = 0; |
333 |
- |
334 |
-- virtual QList< QPair< QString, QgsLayerCoordinateTransform > > layerCoordinateTransforms() const = 0; |
335 |
-+ // virtual QList< QPair< QString, QgsLayerCoordinateTransform > > layerCoordinateTransforms() const = 0; |
336 |
- |
337 |
- virtual int nLayers() const = 0; |
338 |
- |
339 |
-diff --git a/python/server/qgswmsprojectparser.sip b/python/server/qgswmsprojectparser.sip |
340 |
-index f6dd579..13fea73 100644 |
341 |
---- a/python/server/qgswmsprojectparser.sip |
342 |
-+++ b/python/server/qgswmsprojectparser.sip |
343 |
-@@ -63,7 +63,7 @@ class QgsWMSProjectParser : public QgsWMSConfigParser |
344 |
- void setScaleDenominator( double ) /*override*/; |
345 |
- void addExternalGMLData( const QString&, QDomDocument* ) /*override*/ ; |
346 |
- |
347 |
-- QList< QPair< QString, QgsLayerCoordinateTransform > > layerCoordinateTransforms() const /*override*/ ; |
348 |
-+ // QList< QPair< QString, QgsLayerCoordinateTransform > > layerCoordinateTransforms() const /*override*/ ; |
349 |
- |
350 |
- /** Fills a layer and a style list. The two list have the same number of entries and the style and the layer at a position belong together (similar to the HTTP parameters 'Layers' and 'Styles'. Returns 0 in case of success*/ |
351 |
- int layersAndStyles( QStringList& layers, QStringList& styles ) const /*override*/ ; |
352 |
-diff --git a/python/server/server.sip b/python/server/server.sip |
353 |
-index 537cd0b..355d3fa 100644 |
354 |
---- a/python/server/server.sip |
355 |
-+++ b/python/server/server.sip |
356 |
-@@ -1,5 +1,4 @@ |
357 |
- %Module(name=qgis._server, |
358 |
-- version=0, |
359 |
- keyword_arguments="Optional") |
360 |
- |
361 |
- |
362 |
|
363 |
diff --git a/sci-geosciences/qgis/files/qgis-2.18.3-webkit.patch b/sci-geosciences/qgis/files/qgis-2.18.3-webkit.patch |
364 |
deleted file mode 100644 |
365 |
index 971ffde83a9..00000000000 |
366 |
--- a/sci-geosciences/qgis/files/qgis-2.18.3-webkit.patch |
367 |
+++ /dev/null |
368 |
@@ -1,112 +0,0 @@ |
369 |
-commit 222ae663e6ee6f718e45faafd63758c319fec135 |
370 |
-Author: Andreas Sturmlechner <andreas.sturmlechner@×××××.com> |
371 |
-Date: Sun Feb 19 12:51:48 2017 +0100 |
372 |
- |
373 |
- Fix QtWebKit automagic |
374 |
- |
375 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
376 |
-index 3936521..4268019 100644 |
377 |
---- a/CMakeLists.txt |
378 |
-+++ b/CMakeLists.txt |
379 |
-@@ -288,6 +288,10 @@ ELSE() |
380 |
- MESSAGE(STATUS "Found Qt version: ${QTVERSION}") |
381 |
- ENDIF() |
382 |
- |
383 |
-+IF(WITH_QTWEBKIT) |
384 |
-+ SET(OPTIONAL_QTWEBKIT ${QT_QTWEBKIT_LIBRARY}) |
385 |
-+ENDIF(WITH_QTWEBKIT) |
386 |
-+ |
387 |
- IF (WITH_QTMOBILITY) |
388 |
- FIND_PACKAGE(QtMobility 1.1.0) |
389 |
- ENDIF (WITH_QTMOBILITY) |
390 |
-diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt |
391 |
-index 15579de..b6ef545 100644 |
392 |
---- a/src/app/CMakeLists.txt |
393 |
-+++ b/src/app/CMakeLists.txt |
394 |
-@@ -609,7 +609,7 @@ TARGET_LINK_LIBRARIES(qgis_app |
395 |
- ${QWT_LIBRARY} |
396 |
- ${QT_QTSQL_LIBRARY} |
397 |
- ${QT_QTUITOOLS_LIBRARY} |
398 |
-- ${QT_QTWEBKIT_LIBRARY} |
399 |
-+ ${OPTIONAL_QTWEBKIT} |
400 |
- #should only be needed for win |
401 |
- ${QT_QTMAIN_LIBRARY} |
402 |
- ${QWTPOLAR_LIBRARY} |
403 |
-diff --git a/src/browser/CMakeLists.txt b/src/browser/CMakeLists.txt |
404 |
-index e53c1de..1a72070 100644 |
405 |
---- a/src/browser/CMakeLists.txt |
406 |
-+++ b/src/browser/CMakeLists.txt |
407 |
-@@ -80,7 +80,7 @@ TARGET_LINK_LIBRARIES(qbrowser |
408 |
- ${QT_QTNETWORK_LIBRARY} |
409 |
- ${QT_QTSVG_LIBRARY} |
410 |
- ${QT_QTXML_LIBRARY} |
411 |
-- ${QT_QTWEBKIT_LIBRARY} |
412 |
-+ ${OPTIONAL_QTWEBKIT} |
413 |
- ${QT_QTMAIN_LIBRARY} |
414 |
- ${SQLITE3_LIBRARY} |
415 |
- ) |
416 |
-diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt |
417 |
-index e2d9ae8..cd8e305 100644 |
418 |
---- a/src/core/CMakeLists.txt |
419 |
-+++ b/src/core/CMakeLists.txt |
420 |
-@@ -981,7 +981,7 @@ TARGET_LINK_LIBRARIES(qgis_core |
421 |
- ${QT_QTGUI_LIBRARY} |
422 |
- ${QT_QTNETWORK_LIBRARY} |
423 |
- ${QT_QTSVG_LIBRARY} |
424 |
-- ${QT_QTWEBKIT_LIBRARY} |
425 |
-+ ${OPTIONAL_QTWEBKIT} |
426 |
- ${QT_QTSQL_LIBRARY} |
427 |
- ${QCA_LIBRARY} |
428 |
- |
429 |
-diff --git a/src/helpviewer/CMakeLists.txt b/src/helpviewer/CMakeLists.txt |
430 |
-index cec5ad1..ffd0966 100644 |
431 |
---- a/src/helpviewer/CMakeLists.txt |
432 |
-+++ b/src/helpviewer/CMakeLists.txt |
433 |
-@@ -68,7 +68,7 @@ TARGET_LINK_LIBRARIES(qgis_help |
434 |
- ${QT_QTNETWORK_LIBRARY} |
435 |
- ${QT_QTSVG_LIBRARY} |
436 |
- ${QT_QTXML_LIBRARY} |
437 |
-- ${QT_QTWEBKIT_LIBRARY} |
438 |
-+ ${OPTIONAL_QTWEBKIT} |
439 |
- ${QT_QTMAIN_LIBRARY} |
440 |
- ${SQLITE3_LIBRARY} |
441 |
- ) |
442 |
-diff --git a/tests/bench/CMakeLists.txt b/tests/bench/CMakeLists.txt |
443 |
-index b605a6a..aa45a27 100644 |
444 |
---- a/tests/bench/CMakeLists.txt |
445 |
-+++ b/tests/bench/CMakeLists.txt |
446 |
-@@ -35,7 +35,7 @@ TARGET_LINK_LIBRARIES(qgis_bench |
447 |
- ${QT_QTNETWORK_LIBRARY} |
448 |
- ${QT_QTSVG_LIBRARY} |
449 |
- ${QT_QTXML_LIBRARY} |
450 |
-- ${QT_QTWEBKIT_LIBRARY} |
451 |
-+ ${OPTIONAL_QTWEBKIT} |
452 |
- ${QT_QTMAIN_LIBRARY} |
453 |
- ${QT_QTTEST_LIBRARY} |
454 |
- ) |
455 |
-diff --git a/tests/src/gui/CMakeLists.txt b/tests/src/gui/CMakeLists.txt |
456 |
-index f1c823a..94d8692 100644 |
457 |
---- a/tests/src/gui/CMakeLists.txt |
458 |
-+++ b/tests/src/gui/CMakeLists.txt |
459 |
-@@ -102,7 +102,7 @@ MACRO (ADD_QGIS_TEST testname testsrc) |
460 |
- ${QT_QTSVG_LIBRARY} |
461 |
- ${QT_QTTEST_LIBRARY} |
462 |
- ${QT_QTNETWORK_LIBRARY} |
463 |
-- ${QT_QTWEBKIT_LIBRARY} |
464 |
-+ ${OPTIONAL_QTWEBKIT} |
465 |
- ${QT_QTMAIN_LIBRARY} |
466 |
- ${PROJ_LIBRARY} |
467 |
- ${GEOS_LIBRARY} |
468 |
-diff --git a/tests/src/providers/CMakeLists.txt b/tests/src/providers/CMakeLists.txt |
469 |
-index 7e8b2e9..0388150 100644 |
470 |
---- a/tests/src/providers/CMakeLists.txt |
471 |
-+++ b/tests/src/providers/CMakeLists.txt |
472 |
-@@ -124,7 +124,7 @@ IF(UNIX AND NOT ANDROID AND CMAKE_BUILD_TYPE MATCHES Debug) |
473 |
- ${QT_QTNETWORK_LIBRARY} |
474 |
- ${QT_QTSVG_LIBRARY} |
475 |
- ${QT_QTXML_LIBRARY} |
476 |
-- ${QT_QTWEBKIT_LIBRARY} |
477 |
-+ ${OPTIONAL_QTWEBKIT} |
478 |
- ${QT_QTMAIN_LIBRARY} |
479 |
- ${QT_QTSCRIPT_LIBRARY} |
480 |
- qgis_core |