[qgis] 01/05: Add CancelQuery for Qt5 only.

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Sun Mar 13 13:57:22 UTC 2016


This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch qt5
in repository qgis.

commit 9e940d1c2e670330772135bd583647b2e164993f
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Mar 12 21:55:53 2016 +0100

    Add CancelQuery for Qt5 only.
---
 debian/patches/qt5-qspatialite.patch | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/patches/qt5-qspatialite.patch b/debian/patches/qt5-qspatialite.patch
index 96df247..90f17f9 100644
--- a/debian/patches/qt5-qspatialite.patch
+++ b/debian/patches/qt5-qspatialite.patch
@@ -55,11 +55,13 @@ 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
+@@ -531,6 +545,9 @@ bool QSpatiaLiteDriver::hasFeature(Drive
      case BatchOperations:
      case EventNotifications:
      case MultipleResultSets:
++#if QT_VERSION >= 0x050000
 +    case CancelQuery:
++#endif
          return false;
      }
      return false;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.git



More information about the Pkg-grass-devel mailing list