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
|
74e7314c36
|
update sip bindings II
|
2014-01-27 09:22:53 +01:00 |
|
Juergen E. Fischer
|
d4e369414b
|
update sip bindings
|
2014-01-26 18:36:29 +01:00 |
|
Martin Dobias
|
2bece090f5
|
Update Python bindings to match changes in core/gui libraries.
|
2013-12-05 18:27:45 +07:00 |
|
Juergen E. Fischer
|
99f998aa30
|
- add missing sip bindings
- port widgets_tree.py to QtXml and update customization.xml (fixes #5752 and #8054)
|
2013-06-22 19:41:34 +02:00 |
|