|
|
@@ -1,3 +1,73 @@ |
|
|
Larry Shaffer <lshaffer@boundlessgeo.com> 2016-04-15 |
|
|
|
|
|
Remove conversions.sip conditionals meant for 4.12 but actually 4.18 |
|
|
|
|
|
- The hex version of 4.12 was not 0x041200 (current 4.18) but 0x040c00. |
|
|
Code was always skipped and has worked with recent sip versions. |
|
|
|
|
|
(cherry-picked from commit fc6559aa053317cda8ced657c3013a0d4c6549e9) |
|
|
|
|
|
Juergen E. Fischer <jef@norbit.de> 2016-04-25 |
|
|
|
|
|
osgeo4w: add qt plugin directories to browser |
|
|
|
|
|
(cherry picked from commit b758a8c1b4fb5386ba5830092eb893d8f42ae033) |
|
|
|
|
|
Even Rouault <even.rouault@spatialys.com> 2016-04-08 |
|
|
|
|
|
Fix thread-unsafe initialization of QgsExpression::Functions() |
|
|
|
|
|
The method initializes the gmFunctions static member, without any mutex protection. |
|
|
This turned out to cause random crashes in the tests of the WFS provider since the downloader |
|
|
thread may evaluate an expression, in parallel of the main thread, which does the same. |
|
|
This was mainly seen on Mac Travis (2 crashes + 1 failures, over 50 iterations), when |
|
|
parallelizing tests so as to get particular scheduling : |
|
|
https://travis-ci.org/rouault/Quantum-GIS/builds/121720556. |
|
|
But I could finally reproduce it systematically on my Linux box when inserting the following sleep. |
|
|
|
|
|
diff --git a/src/providers/wfs/qgswfsshareddata.cpp b/src/providers/wfs/qgswfsshareddata.cpp |
|
|
index adc7042..e9e4577 100644 |
|
|
--- a/src/providers/wfs/qgswfsshareddata.cpp |
|
|
+++ b/src/providers/wfs/qgswfsshareddata.cpp |
|
|
@@ -426,6 +426,7 @@ int QgsWFSSharedData::registerToCache( QgsWFSFeatureIterator* iterator, QgsRecta |
|
|
connect( mDownloader, SIGNAL( ready() ), &loop, SLOT( quit() ) ); |
|
|
mDownloader->start(); |
|
|
loop.exec( QEventLoop::ExcludeUserInputEvents ); |
|
|
+ usleep( 100 * 1000 ); |
|
|
} |
|
|
if ( mDownloadFinished ) |
|
|
return -1; |
|
|
|
|
|
After applying this commit, the Mac builder is fine: |
|
|
https://travis-ci.org/rouault/Quantum-GIS/builds/121756158 |
|
|
|
|
|
rldhont <rldhont@gmail.com> 2016-04-08 |
|
|
|
|
|
[BUGFIX] QGIS Server segfault when features does not have the same fields as the layer. |
|
|
|
|
|
In some WFS GetFeature request, with Filter or FeatureId, all the fields are not well loaded in the feature. |
|
|
|
|
|
To fix it, we just verifying that the attribute index is lesser than the feature fields count. |
|
|
|
|
|
Fixes #14619 |
|
|
|
|
|
Juergen E. Fischer <jef@norbit.de> 2016-04-06 |
|
|
|
|
|
don't crash when reply is destroyed while it's waiting for credentials |
|
|
to be entered |
|
|
|
|
|
(backports 10a26e6) |
|
|
|
|
|
Juergen E. Fischer <jef@norbit.de> 2016-03-31 |
|
|
|
|
|
globe plugin: fix crash on exit |
|
|
|
|
|
(cherry picked from commit bde512646caffc48f3158ec42b56016aeaae77fd) |
|
|
|
|
|
Juergen E. Fischer <jef@norbit.de> 2016-03-25 |
|
|
|
|
|
Release of 2.8.8 |
|
|
|
|
|
Even Rouault <even.rouault@spatialys.com> 2016-03-24 |
|
|
|
|
|
[Spatialite] Fix crash on iterator closing if connection failed. |
|
|