This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch master
in repository qgis.
commit ab92dee793a2310b6b2f01c1c74918dd41115143
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Sat Mar 1 14:41:12 2014 +0100
Add patch from upstream release_2.2 branch:
0001-Fix-9396-datum-transform-in-save-as-dialog.patch
---
...ix-9396-datum-transform-in-save-as-dialog.patch | 24 ++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git
a/debian/patches/0001-Fix-9396-datum-transform-in-save-as-dialog.patch
b/debian/patches/0001-Fix-9396-datum-transform-in-save-as-dialog.patch
new file mode 100644
index 0000000..ec47f68
--- /dev/null
+++ b/debian/patches/0001-Fix-9396-datum-transform-in-save-as-dialog.patch
@@ -0,0 +1,24 @@
+From a0c180ac2b2c4d96edf8d2ea558753032f0d559b Mon Sep 17 00:00:00 2001
+From: Martin Dobias <wonder...@gmail.com>
+Date: Tue, 25 Feb 2014 16:29:30 +0700
+Subject: Fix #9396 (datum transform in save as dialog)
+Bug: http://hub.qgis.org/issues/9396
+Origin:
https://github.com/qgis/QGIS/commit/a0c180ac2b2c4d96edf8d2ea558753032f0d559b
+
+---
+ src/app/qgisapp.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/src/app/qgisapp.cpp
++++ b/src/app/qgisapp.cpp
+@@ -4753,8 +4753,9 @@ void QgisApp::saveAsVectorFileGeneral( b
+ ct = new QgsCoordinateTransform( vlayer->crs(), destCRS );
+
+ //ask user about datum transformation
++ QSettings settings;
+ QList< QList< int > > dt =
QgsCoordinateTransform::datumTransformations( vlayer->crs(), destCRS );
+- if ( dt.size() > 1 )
++ if ( dt.size() > 1 && settings.value(
"/Projections/showDatumTransformDialog", false ).toBool() )
+ {
+ QgsDatumTransformDialog d( vlayer->name(), dt );
+ if ( d.exec() == QDialog::Accepted )
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/qgis.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
