Sandro Mani 
							
						 
					 
					
						
						
						
						
							
						
						
							7b31a17e44 
							
						 
					 
					
						
						
							
							Fix infinite loop in QgsVectorLayer::deleteSelectedFeatures if removal of feature fails  
						
						 
						
						
						
						
					 
					
						2015-01-19 15:22:20 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Juergen E. Fischer 
							
						 
					 
					
						
						
						
						
							
						
						
							9ceb5ceab6 
							
						 
					 
					
						
						
							
							sip sync  
						
						 
						
						
						
						
					 
					
						2014-11-21 01:17:21 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Juergen E. Fischer 
							
						 
					 
					
						
						
						
						
							
						
						
							4bc4636aeb 
							
						 
					 
					
						
						
							
							fix typos  
						
						 
						
						
						
						
					 
					
						2014-10-28 12:22:42 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthias Kuhn 
							
						 
					 
					
						
						
						
						
							
						
						
							c1c81eae94 
							
						 
					 
					
						
						
							
							Update sip bindings  
						
						 
						
						
						
						
					 
					
						2014-09-22 18:38:36 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthias Kuhn 
							
						 
					 
					
						
						
						
						
							
						
						
							bb3ead3b0f 
							
						 
					 
					
						
						
							
							Transfer ownership of drag-and-drop layout elements in sip  
						
						 
						
						... 
						
						
						
						Fix  #11207  
						
						
					 
					
						2014-09-22 11:25:40 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Martin Dobias 
							
						 
					 
					
						
						
						
						
							
						
						
							de48dad6e9 
							
						 
					 
					
						
						
							
							Followup  #10912  - detect cycles in joins and reject joins that would create cycle  
						
						 
						
						... 
						
						
						
						Cycle would otherwise cause infinite loop when updating fields and it does not make sense 
						
						
					 
					
						2014-09-16 12:11:15 +07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Martin Dobias 
							
						 
					 
					
						
						
						
						
							
						
						
							ffcd07b066 
							
						 
					 
					
						
						
							
							Joins: optionally use just a subset of fields from joined layer  
						
						 
						
						
						
						
					 
					
						2014-09-13 14:27:52 +07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Martin Dobias 
							
						 
					 
					
						
						
						
						
							
						
						
							fba5c5a656 
							
						 
					 
					
						
						
							
							Move triggerRepaint() to QgsMapLayer, use it instead of deprecated clearCacheImage()  
						
						 
						
						
						
						
					 
					
						2014-09-11 23:52:21 +07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthias Kuhn 
							
						 
					 
					
						
						
						
						
							
						
						
							1395367e58 
							
						 
					 
					
						
						
							
							[FEATURE] Expression field (Virtual field)  
						
						 
						
						
						
						
					 
					
						2014-07-24 08:57:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Juergen E. Fischer 
							
						 
					 
					
						
						
						
						
							
						
						
							45c0be1059 
							
						 
					 
					
						
						
							
							sip: remove enum constants  
						
						 
						
						
						
						
					 
					
						2014-06-02 21:52:02 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Juergen E. Fischer 
							
						 
					 
					
						
						
						
						
							
						
						
							c4c131ef75 
							
						 
					 
					
						
						
							
							sip sync  
						
						 
						
						
						
						
					 
					
						2014-05-27 23:32:42 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Martin Dobias 
							
						 
					 
					
						
						
						
						
							
						
						
							62e499e1be 
							
						 
					 
					
						
						
							
							Promote rendererChanged() signal from raster+vector layer to base map layer  
						
						 
						
						
						
						
					 
					
						2014-05-26 21:29:28 +07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Juergen E. Fischer 
							
						 
					 
					
						
						
						
						
							
						
						
							0903684314 
							
						 
					 
					
						
						
							
							fix edit widget deprecation warnings and sync sip bindings  
						
						 
						
						
						
						
					 
					
						2014-05-24 03:52:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthias Kuhn 
							
						 
					 
					
						
						
						
						
							
						
						
							ea91b6fe4a 
							
						 
					 
					
						
						
							
							[FEATURE] Port editor widgets to new API  
						
						 
						
						... 
						
						
						
						Create a new widget for for attribute form
fix  #10281 
fix  #7319 
fix  #7013 
fix  #9335 
fix  #4417  
						
						
					 
					
						2014-05-22 22:50:36 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Martin Dobias 
							
						 
					 
					
						
						
						
						
							
						
						
							fafa58ed24 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into threading-revival  
						
						 
						
						... 
						
						
						
						Conflicts:
	src/core/qgspallabeling.cpp
	src/core/qgsrenderchecker.h
	src/core/qgsvectorlayer.cpp
	src/core/symbology-ng/qgslinesymbollayerv2.cpp
	src/core/symbology-ng/qgssymbollayerv2.cpp
	src/providers/wms/qgswmsdataitems.cpp
	tests/src/core/testqgsblendmodes.cpp 
						
						
					 
					
						2014-02-23 20:12:50 +07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Martin Dobias 
							
						 
					 
					
						
						
						
						
							
						
						
							5a4f8d07a0 
							
						 
					 
					
						
						
							
							Change "added/deprecated in 2.1" notes to 2.4 for stuff related to threading  
						
						 
						
						
						
						
					 
					
						2014-02-21 17:33:09 +07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Martin Dobias 
							
						 
					 
					
						
						
						
						
							
						
						
							da1ebc2693 
							
						 
					 
					
						
						
							
							Comments and API improvements of simplification (no functional changes)  
						
						 
						
						... 
						
						
						
						- moved QgsVectorLayer::SimplifyHint enum to QgsVectorSimplifyMethod
- use QFlags instead of int for hints
- added few notes about simplification being added in 2.2 
						
						
					 
					
						2014-02-21 12:08:50 +07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Martin Dobias 
							
						 
					 
					
						
						
						
						
							
						
						
							a3af93394e 
							
						 
					 
					
						
						
							
							Merge branch 'master' into threading-revival  
						
						 
						
						... 
						
						
						
						Some features are still disabled - will be fixed later
Conflicts:
	python/core/composer/qgscomposition.sip
	python/core/diagram/qgsdiagram.sip
	python/core/diagram/qgshistogramdiagram.sip
	python/core/diagram/qgspiediagram.sip
	python/core/diagram/qgstextdiagram.sip
	python/core/qgsdiagramrendererv2.sip
	python/core/qgsfield.sip
	python/core/qgslabelsearchtree.sip
	python/core/qgsmaprenderer.sip
	python/core/qgsrenderchecker.sip
	python/core/symbology-ng/qgssymbollayerv2.sip
	python/gui/qgsmapcanvas.sip
	src/app/composer/qgscomposerlegendwidget.cpp
	src/app/qgisapp.cpp
	src/core/composer/qgsatlascomposition.cpp
	src/core/composer/qgscomposerattributetable.cpp
	src/core/composer/qgscomposermap.cpp
	src/core/composer/qgscomposition.cpp
	src/core/composer/qgscomposition.h
	src/core/diagram/qgsdiagram.h
	src/core/diagram/qgshistogramdiagram.cpp
	src/core/diagram/qgshistogramdiagram.h
	src/core/diagram/qgspiediagram.cpp
	src/core/diagram/qgspiediagram.h
	src/core/diagram/qgstextdiagram.cpp
	src/core/diagram/qgstextdiagram.h
	src/core/qgsdiagramrendererv2.cpp
	src/core/qgsdiagramrendererv2.h
	src/core/qgsmaprenderer.cpp
	src/core/qgsmaprenderer.h
	src/core/qgsnetworkaccessmanager.h
	src/core/qgspallabeling.cpp
	src/core/qgsrenderchecker.h
	src/core/qgsvectorlayer.cpp
	src/core/qgsvectorlayer.h
	src/core/qgsvectorlayerfeatureiterator.cpp
	src/core/qgsvectorlayerfeatureiterator.h
	src/core/raster/qgsrasterlayer.cpp
	src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp
	src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
	src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
	src/core/symbology-ng/qgssinglesymbolrendererv2.cpp
	src/core/symbology-ng/qgssymbollayerv2.cpp
	src/core/symbology-ng/qgssymbollayerv2.h
	src/core/symbology-ng/qgssymbolv2.cpp
	src/gui/qgshighlight.cpp
	src/gui/qgsmapcanvas.cpp
	src/gui/qgsmapcanvas.h
	src/gui/qgsmapcanvasitem.cpp
	src/gui/qgsmaptoolidentify.cpp
	src/plugins/georeferencer/qgsgeorefplugingui.cpp
	src/providers/memory/qgsmemoryfeatureiterator.cpp
	src/providers/ogr/qgsogrfeatureiterator.cpp
	src/providers/ogr/qgsogrfeatureiterator.h
	src/providers/ogr/qgsogrprovider.cpp
	src/providers/oracle/qgsoraclefeatureiterator.cpp
	src/providers/oracle/qgsoracleprovider.cpp
	src/providers/postgres/qgspostgresconn.cpp
	src/providers/postgres/qgspostgresfeatureiterator.cpp
	src/providers/postgres/qgspostgresfeatureiterator.h
	src/providers/wfs/qgswfsfeatureiterator.cpp
	src/providers/wms/qgswmsprovider.cpp
	src/providers/wms/qgswmsprovider.h
	src/ui/qgsoptionsbase.ui
	tests/src/core/CMakeLists.txt
	tests/src/core/testqgscomposereffects.cpp
	tests/src/core/testqgscomposerhtml.cpp
	tests/src/core/testqgscomposerscalebar.cpp
	tests/src/core/testqgscomposershapes.cpp 
						
						
					 
					
						2014-02-18 11:28:46 +07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Juergen E. Fischer 
							
						 
					 
					
						
						
						
						
							
						
						
							52616b6549 
							
						 
					 
					
						
						
							
							vector layer: save old attribute values where available to speedup undo (and rollback) ( fixes   #9509 )  
						
						 
						
						... 
						
						
						
						field calculator & app: use wait cursor while calculating and committing or rolling back 
						
						
					 
					
						2014-02-08 23:28:52 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Martin Dobias 
							
						 
					 
					
						
						
						
						
							
						
						
							caf33b657f 
							
						 
					 
					
						
						
							
							Fix   #8174  (overlaps when using 'avoid intersections' functionality) + test  
						
						 
						
						... 
						
						
						
						I am not entirely confident if it will work perfectly with older versions of GEOS (< 3.3)
because of the lack of unary union (that is emulated by series of unions of two geometries) 
						
						
					 
					
						2014-02-07 12:03:18 +07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Juergen E. Fischer 
							
						 
					 
					
						
						
						
						
							
						
						
							d4e369414b 
							
						 
					 
					
						
						
							
							update sip bindings  
						
						 
						
						
						
						
					 
					
						2014-01-26 18:36:29 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ahuarte47 
							
						 
					 
					
						
						
						
						
							
						
						
							031596c4e4 
							
						 
					 
					
						
						
							
							#8725R: define simplifyDrawingCanbeApplied better  
						
						 
						
						
						
						
					 
					
						2014-01-21 02:12:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ahuarte47 
							
						 
					 
					
						
						
						
						
							
						
						
							d439dfbc88 
							
						 
					 
					
						
						
							
							#8725-R: include qgsvectorsimplifymethod.sip  
						
						 
						
						
						
						
					 
					
						2014-01-15 11:00:01 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Martin Dobias 
							
						 
					 
					
						
						
						
						
							
						
						
							2bece090f5 
							
						 
					 
					
						
						
							
							Update Python bindings to match changes in core/gui libraries.  
						
						 
						
						
						
						
					 
					
						2013-12-05 18:27:45 +07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Mercier 
							
						 
					 
					
						
						
						
						
							
						
						
							bf076a0c1f 
							
						 
					 
					
						
						
							
							Emit a signal when layer symbology changes  
						
						 
						
						
						
						
					 
					
						2013-10-04 09:59:18 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Juergen E. Fischer 
							
						 
					 
					
						
						
						
						
							
						
						
							078a941f85 
							
						 
					 
					
						
						
							
							rename QgsVectorLayer::listAllFeatureIds() to allFeatureIds() (followup dd48cd3)  
						
						 
						
						
						
						
					 
					
						2013-09-15 17:00:36 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Denis Rouzaud 
							
						 
					 
					
						
						
						
						
							
						
						
							39fab67e60 
							
						 
					 
					
						
						
							
							added listAllFeatureIds and check that features exist when setting selection  
						
						 
						
						
						
						
					 
					
						2013-09-15 17:00:36 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Larry Shaffer 
							
						 
					 
					
						
						
						
						
							
						
						
							f66f9aaa3e 
							
						 
					 
					
						
						
							
							Fix build error, add missing enum to sip file  
						
						 
						
						
						
						
					 
					
						2013-09-06 19:47:15 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Larry Shaffer 
							
						 
					 
					
						
						
						
						
							
						
						
							d334672f6d 
							
						 
					 
					
						
						
							
							Followup to 3b6d4ef, add sip bindings and update console auto-complete file  
						
						 
						
						
						
						
					 
					
						2013-09-06 17:31:47 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marco Hugentobler 
							
						 
					 
					
						
						
						
						
							
						
						
							8f9b89dd67 
							
						 
					 
					
						
						
							
							Clean up code related to old overlay object system  
						
						 
						
						
						
						
					 
					
						2013-07-06 16:18:30 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Juergen E. Fischer 
							
						 
					 
					
						
						
						
						
							
						
						
							3854086d47 
							
						 
					 
					
						
						
							
							sip update  
						
						 
						
						
						
						
					 
					
						2013-06-23 16:00:24 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Larry Shaffer 
							
						 
					 
					
						
						
						
						
							
						
						
							430f0fcb1b 
							
						 
					 
					
						
						
							
							Add user notification when defined labeling font is not found on system, then substituted  
						
						 
						
						... 
						
						
						
						- [API] add signal to QgsVectorLayer that is emitted when its labeling font is not found
- Message bar notification on first rendering of layer offers link to open layer's labeling dialog
- Add 'font not found' notification to labeling dialog
- Labeling dialog defaults to 'Text style' section when font is not found, to show notice
- Substituted font is not saved with project, unless user applies changes.
- Change labeling gui font selector dialog to font family combobox (since only family is being chosen) 
						
						
					 
					
						2013-06-09 18:54:08 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Juergen E. Fischer 
							
						 
					 
					
						
						
						
						
							
						
						
							59788cb8fc 
							
						 
					 
					
						
						
							
							- sync sip binding of QgsVectorLayer  
						
						 
						
						... 
						
						
						
						- [API] introduce signal QgsVectorLayer::beforeRollBack()
- merge consecutive geometry changes (fixes  #7929 )
- avoid validation in nodetool on rollback 
						
						
					 
					
						2013-05-29 22:57:05 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Denis Rouzaud 
							
						 
					 
					
						
						
						
						
							
						
						
							e741ec947d 
							
						 
					 
					
						
						
							
							add select all features methods for vector layers  
						
						 
						
						
						
						
					 
					
						2013-05-22 11:53:36 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								nyalldawson 
							
						 
					 
					
						
						
						
						
							
						
						
							519fe2f4ac 
							
						 
					 
					
						
						
							
							Add python bindings and tests for grid blending, grid annotation font color, vector feature blending and vector layer transparency  
						
						 
						
						
						
						
					 
					
						2013-05-13 22:28:00 +10:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Juergen E. Fischer 
							
						 
					 
					
						
						
						
						
							
						
						
							e0907b0f0a 
							
						 
					 
					
						
						
							
							more spelling fixes  
						
						 
						
						
						
						
					 
					
						2013-05-03 21:39:28 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Juergen E. Fischer 
							
						 
					 
					
						
						
						
						
							
						
						
							ea1aaeae01 
							
						 
					 
					
						
						
							
							cleanup style to db:  
						
						 
						
						... 
						
						
						
						- add sip bindings to new methods
- table name, sql queries and constants should not be translated
- replace QVector<QString> with QStringList 
						
						
					 
					
						2013-05-03 00:25:39 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthias Kuhn 
							
						 
					 
					
						
						
						
						
							
						
						
							7c69ec1a28 
							
						 
					 
					
						
						
							
							Add updateFields() signal, so adding of joined fields is communicated  
						
						 
						
						... 
						
						
						
						attributeAdded and attributeDeleted signals are only emitted for "real" fields
and not for "virtual fields" as in joined fields. Therefore this signal should
be used instead to keep track of these 
						
						
					 
					
						2013-04-15 09:54:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthias Kuhn 
							
						 
					 
					
						
						
						
						
							
						
						
							47c10db1fe 
							
						 
					 
					
						
						
							
							[ FIX   #5525 ] Attribute table performance for large tables  
						
						 
						
						... 
						
						
						
						The selection handling performance has been improved a lot
Introduces also more detailed signalling of selection change from QgsVectorLayer 
						
						
					 
					
						2013-04-13 17:43:11 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Martin Dobias 
							
						 
					 
					
						
						
						
						
							
						
						
							c2f00caedf 
							
						 
					 
					
						
						
							
							[API] Removed old renderer support from QgsVectorLayer  
						
						 
						
						
						
						
					 
					
						2013-04-07 23:46:57 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Juergen E. Fischer 
							
						 
					 
					
						
						
						
						
							
						
						
							6e6b8fe64f 
							
						 
					 
					
						
						
							
							widget fixes:  
						
						 
						
						... 
						
						
						
						- add sip bindings for new widgets (and some other missing pieces)
- change Webview to WebView (like in QWebView)
- use proxy settings also for webview widget
- don't disable Photo and webview widget
- use smooth transformation in photo widget
- show disabled color button with dotted border in actual color instead of
  grayed-out 
						
						
					 
					
						2013-04-02 16:38:06 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Juergen E. Fischer 
							
						 
					 
					
						
						
						
						
							
						
						
							fe6b4ad46d 
							
						 
					 
					
						
						
							
							update vector layer sip bindings  
						
						 
						
						
						
						
					 
					
						2013-03-20 13:35:56 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Martin Dobias 
							
						 
					 
					
						
						
						
						
							
						
						
							5d42734cf2 
							
						 
					 
					
						
						
							
							Removed old vector layer API (select(), nextFeature(), featureAtId())  
						
						 
						
						
						
						
					 
					
						2013-03-16 19:42:45 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Juergen E. Fischer 
							
						 
					 
					
						
						
						
						
							
						
						
							ba2082ef86 
							
						 
					 
					
						
						
							
							[FEATURE] allow filter expressions in value relations (and fix display of related values and value maps in attribute table)  
						
						 
						
						
						
						
					 
					
						2013-02-10 23:08:40 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Juergen E. Fischer 
							
						 
					 
					
						
						
						
						
							
						
						
							4a774294f3 
							
						 
					 
					
						
						
							
							remove usage of deprecated methods within QgsVectorLayer itself  
						
						 
						
						
						
						
					 
					
						2013-02-02 17:05:33 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Juergen E. Fischer 
							
						 
					 
					
						
						
						
						
							
						
						
							4cbec1811c 
							
						 
					 
					
						
						
							
							fix warnings, add copyright headers, cosmetics  
						
						 
						
						
						
						
					 
					
						2013-01-28 01:39:58 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Martin Dobias 
							
						 
					 
					
						
						
						
						
							
						
						
							8da06cb97d 
							
						 
					 
					
						
						
							
							QgsVectorLayer: deprecate old API: select(), nextFeature(), featureAtId()  
						
						 
						
						
						
						
					 
					
						2013-01-26 19:42:46 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Martin Dobias 
							
						 
					 
					
						
						
						
						
							
						
						
							5f304b34a1 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into new_vector_api  
						
						 
						
						... 
						
						
						
						Conflicts:
	python/core/qgsvectordataprovider.sip
	src/app/legend/qgslegendlayer.cpp
	src/app/qgisapp.cpp
	src/app/qgsmergeattributesdialog.cpp
	src/core/qgsvectordataprovider.cpp
	src/core/qgsvectordataprovider.h
	src/core/qgsvectorlayer.cpp
	src/gui/qgssearchquerybuilder.cpp
	src/providers/postgres/qgspostgresprovider.cpp
	src/providers/wfs/CMakeLists.txt 
						
						
					 
					
						2013-01-23 23:46:56 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthias Kuhn 
							
						 
					 
					
						
						
						
						
							
						
						
							5c38775be4 
							
						 
					 
					
						
						
							
							Always emit signal when attribute values change  
						
						 
						
						... 
						
						
						
						Fix  #9268 
  * Remove QgsVectorLayer::blockSignals() calls from QgsFieldCalculator
  * Deprecate emitSignal parameter from QgsVectorLayer::changeAttributeValue( fid, field, value, emitSignal )
  * Code cleanup to update calls to the new emitSignal-less method 
						
						
					 
					
						2014-01-07 12:54:18 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Juergen E. Fischer 
							
						 
					 
					
						
						
						
						
							
						
						
							190c0511bc 
							
						 
					 
					
						
						
							
							fix most cppcheck warnings and implement suggestions  
						
						 
						
						... 
						
						
						
						also update and sync some sip interfaces 
						
						
					 
					
						2014-01-05 16:11:36 +01:00