[qgis] 04/07: Add patch from upstream release_2.2 branch: 0001-More-LongLong-fixes.patch

Bas Couwenberg sebastic at xs4all.nl
Fri Mar 14 01:05:22 UTC 2014


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

sebastic-guest pushed a commit to branch master
in repository qgis.

commit 26d4f77138e541524f0b74026493ca3c1f7dfc11
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Mar 13 21:36:10 2014 +0100

    Add patch from upstream release_2.2 branch: 0001-More-LongLong-fixes.patch
---
 debian/patches/0001-More-LongLong-fixes.patch | 33 +++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/debian/patches/0001-More-LongLong-fixes.patch b/debian/patches/0001-More-LongLong-fixes.patch
new file mode 100644
index 0000000..1cff51a
--- /dev/null
+++ b/debian/patches/0001-More-LongLong-fixes.patch
@@ -0,0 +1,33 @@
+From 7d0cdb7b47ef69d3f2292e7a427c97c1cddbd366 Mon Sep 17 00:00:00 2001
+From: Matthias Kuhn <matthias.kuhn at gmx.ch>
+Date: Tue, 11 Mar 2014 17:21:14 +0100
+Subject: =?UTF-8?q?More=20LongLong=20fixes=0AFix=20#9761?=
+Origin: https://github.com/qgis/QGIS/commit/7d0cdb7b47ef69d3f2292e7a427c97c1cddbd366
+Bug: http://hub.qgis.org/issues/9761
+
+---
+ src/gui/qgsattributedialog.cpp |    1 +
+ src/gui/qgsattributeeditor.cpp |    2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+--- a/src/gui/qgsattributedialog.cpp
++++ b/src/gui/qgsattributedialog.cpp
+@@ -405,6 +405,7 @@ void QgsAttributeDialog::init()
+         {
+           case QVariant::Invalid: text = "NULL"; break;
+           case QVariant::Int: text = QString::number( value.toInt() ); break;
++          case QVariant::LongLong: text = QString::number( value.toLongLong() ); break;
+           case QVariant::Double: text = QString::number( value.toDouble() ); break;
+           case QVariant::String:
+           default: text = value.toString();
+--- a/src/gui/qgsattributeeditor.cpp
++++ b/src/gui/qgsattributeeditor.cpp
+@@ -1207,7 +1207,7 @@ bool QgsAttributeEditor::setValue( QWidg
+     case QgsVectorLayer::SliderRange:
+     case QgsVectorLayer::EditRange:
+     {
+-      if ( myFieldType == QVariant::Int )
++      if ( myFieldType == QVariant::Int || myFieldType == QVariant::LongLong )
+       {
+         if ( editType == QgsVectorLayer::EditRange )
+         {

-- 
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