This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch qt5 in repository qgis.
commit 71db4045a3f8ace5041c2632932bc9cd22d5c2e1 Author: Bas Couwenberg <[email protected]> Date: Sat Mar 12 20:59:03 2016 +0100 Fix warning by handling CancelQuery in hasFeature(). --- debian/patches/qt5-qspatialite.patch | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/debian/patches/qt5-qspatialite.patch b/debian/patches/qt5-qspatialite.patch index 4f775f0..96df247 100644 --- a/debian/patches/qt5-qspatialite.patch +++ b/debian/patches/qt5-qspatialite.patch @@ -10,6 +10,7 @@ Description: Add support for Qt5 to qspatialite provider. For Qt5 Q_PLUGIN_METADATA() should be used instead of Q_EXPORT_PLUGIN2() per http://doc.qt.io/qt-5/qtquick-porting-qt5.html#qml-plugins . + CancelQuery is marked as not supported in hasFeature() to fix a warning. Author: Bas Couwenberg <[email protected]> Forwarded: https://github.com/qgis/QGIS/pull/2903 @@ -54,6 +55,14 @@ Forwarded: https://github.com/qgis/QGIS/pull/2903 QVariant QSpatiaLiteResult::handle() const { return QVariant::fromValue(d->stmt); +@@ -531,6 +545,7 @@ bool QSpatiaLiteDriver::hasFeature(Drive + case BatchOperations: + case EventNotifications: + case MultipleResultSets: ++ case CancelQuery: + return false; + } + return false; --- a/src/providers/spatialite/qspatialite/qsql_spatialite.h +++ b/src/providers/spatialite/qspatialite/qsql_spatialite.h @@ -80,6 +80,9 @@ protected: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
