sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-10 00:13:55 -04:00
Code Issues Packages Projects Releases Wiki Activity
33,796 Commits 83 Branches 277 Tags
Commit Graph

33796 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nyall Dawson
9e1ddcb54d [processing] Allow modification of feature request when using 
vector.features

Allows for optimising the request through subsets of attributes
or no geometry fetching
 2016-07-13 12:06:41 +10:00
Matthias Kuhn
f34c79c04b Use Q_FOREACH 2016-07-12 19:29:54 +02:00
Matthias Kuhn
e49661d7e0 [server] Fix crash in WMS server when... bad things happen 
No idea what exactly the reason is, and it was only discovered by
countless hours of printf-debugging. So I'm just pushing the fix
for everyone else who might be affected.
 2016-07-12 19:29:10 +02:00
Matthias Kuhn
ae3db0a1bf Fix single process build 
A race condition triggered that sometimes the file
output/python/qgis/__init__.py was not created before a python uic
compiler started and therefore the required module could not be
imported.

This leads to errors like

[ 82%] Generating ui_dialogAbout.py
Traceback (most recent call last):
  File "../../../../../scripts/pyuic-wrapper.py", line 26, in <module>
    import qgis.PyQt.uic.pyuic
ImportError: No module named qgis.PyQt.uic.pyuic
python/plugins/GdalTools/tools/CMakeFiles/zzz-GdalTools-2-depend.dir/build.make:117:
recipe for target 'python/plugins/GdalTools/tools/ui_dialogAbout.py'
failed
make[2]: *** [python/plugins/GdalTools/tools/ui_dialogAbout.py] Error 1
CMakeFiles/Makefile2:5074: recipe for target
'python/plugins/GdalTools/tools/CMakeFiles/zzz-GdalTools-2-depend.dir/all'
failed
make[1]: ***
[python/plugins/GdalTools/tools/CMakeFiles/zzz-GdalTools-2-depend.dir/all]
Error 2
Makefile:160: recipe for target 'all' failed
make: *** [all] Error 2
 2016-07-12 11:40:00 +02:00
Alessandro Pasotti
e59fda26e6 Merge pull request #3298 from elpaso/offline_editing_tests2 
[offline editing] Added insert and update tests
 2016-07-12 10:23:47 +02:00
Alessandro Pasotti
b5f02e3d25 [offline editing] Wait for the WFS server to stop 2016-07-12 09:27:43 +02:00
Alessandro Pasotti
b5c0bc9b83 [offline editing] Added insert and update tests 2016-07-12 09:27:43 +02:00
Nyall Dawson
2ccc7e1291 [oracle] Fix potential crash on exit 2016-07-12 16:09:32 +10:00
Nyall Dawson
aaa654fba9 Avoid some unnecessary composer legend updates 2016-07-12 15:40:24 +10:00
Matthias Kuhn
63f9f718d3 [travis] Report compiler correctly for qt5: clang 2016-07-11 18:26:08 +02:00
Martin Dobias
c5d8cc7fbc Added missing & in setTitle in SIP 2016-07-11 12:46:17 +02:00
Matthias Kuhn
774a823983 [travis] Blacklist failing osx tests 2016-07-11 11:11:23 +02:00
Matthias Kuhn
858808107c [travis] Add GRASS_PREFIX7 to osx build 2016-07-11 11:11:22 +02:00
Matthias Kuhn
d06859a88d [travis] Modernize Mac OSX dependencies 2016-07-11 11:11:22 +02:00
Jürgen Fischer
c895ba3199 Merge pull request #3296 from nirvn/splashscreen_fix 
[splashscreen] fix pixelated scaling
 2016-07-11 08:29:00 +02:00
Juergen E. Fischer
2efe684d94 fix 39d6e79 
(cherry picked from commit 2f9ed29d9a5ec7fa79c7f902f036a81c43b8a2da)
 2016-07-11 08:18:00 +02:00
Nyall Dawson
7d822f01c7 Show tooltips for layer style dock labeling tabs 2016-07-11 15:14:45 +10:00
nirvn
de6320279a [splashscreen] fix pixelated scaling 2016-07-11 09:32:02 +07:00
Nyall Dawson
9c85f94a8b Merge pull request #3294 from nyalldawson/brief_test 
Add a doxygen test to ensure all classes have a brief description
 2016-07-11 11:03:58 +10:00
Nyall Dawson
d3582abbf6 [FEATURE] Mouse wheel over sliders in color dialog to change value by 
increments
 2016-07-11 10:27:16 +10:00
Nyall Dawson
b08dd47091 Add a doxygen test to ensure all classes have a brief description 2016-07-11 09:28:46 +10:00
Nyall Dawson
4145e337ab Add missing SIP bindings 2016-07-11 08:42:52 +10:00
Nyall Dawson
8828197a03 Fix minor Coverity issues 2016-07-11 08:42:50 +10:00
Nyall Dawson
b94fbc0485 [oracle] Fix minor Coverity issues 2016-07-11 08:07:32 +10:00
Matthias Kuhn
9a917c4b48 Create some properties on QgsProject 2016-07-10 22:14:49 +02:00
Juergen E. Fischer
3da19183dc release.pl: use 99 instead of 999 for premajor minor 2016-07-10 20:53:59 +02:00
Jürgen Fischer
0cff17f966 Merge pull request #3293 from timlinux/fix-osx-build 
Fix build issue on OSX caused by minor version of 999
 2016-07-10 20:52:08 +02:00
Tim Sutton
3a419c054b Fix build issue on OSX caused by minor version of 999 2016-07-10 19:58:19 +07:00
Juergen E. Fischer
2eee2e5c9c fix typos and debian/copyright 2016-07-10 14:20:07 +02:00
Juergen E. Fischer
daea10c126 support utf-8 encoded release names 
(cherry picked from commit c9838ccea481c8ca87c4e1647099cfe78777e795)
 2016-07-10 12:09:29 +02:00
Jürgen Fischer
9e70e2f629 Merge pull request #3288 from sebastic/scalable-icons 
Fix installation path of scalable icons.
 2016-07-09 23:13:05 +02:00
Bas Couwenberg
f5b8623012 Fix installation path of scalable icons. 2016-07-09 23:10:16 +02:00
Matthias Kuhn
831337c95a Initialize variables 
Coverity fixe
 2016-07-09 17:42:21 +02:00
Matteo
c3edae1b66 Just added a new person to the contrib map and list (#3285) 
* Add Me in the map

* Add Me in the contrib list
 2016-07-09 15:02:39 +02:00
Alexandre Neto
ca9a997361 Add current documentation contributers (#3283) 
Alexandre Neto,
Harrissou Sant-anna
Yves Jacolin
 2016-07-09 15:02:27 +02:00
Matthias Kuhn
41378e1770 Shutup build warning with Qt 5.6 2016-07-09 14:05:38 +02:00
Daan Goedkoop
d2c986343c Add null handling to value map edit widget (fixes #15215) (#3274) 
* Add null handling to value map edit widget (fixes #15215)

* Return QVariant type

* Use hardcoded value for 'null' representation

* Detect "null" value when loading value map from csv; use null QString constructor

* Use configured "null" representation for display in value map

* Use single definition for value map null representation guid

* Added unit test for value map widget and fixed value displaying bug
 2016-07-09 12:25:52 +02:00
Juergen E. Fischer
07da9b1788 Bump version to 2.999 2016-07-08 14:12:36 +02:00
Juergen E. Fischer
17562bd877 changelog and news update for 2.16 2016-07-08 14:11:46 +02:00
Juergen E. Fischer
68c2b0a8b8 translation update for 2.16 from transifex 2016-07-08 14:11:38 +02:00
Juergen E. Fischer
e451b9ad6f indentation and spelling fixes 2016-07-08 12:59:38 +02:00
Salvatore Larosa
43334df6d8 [pyqgis-console] APIs file updated 2016-07-08 12:23:51 +02:00
Nyall Dawson
873eb7f90a Fix incorrect label/diagram distance when map is rotated 2016-07-08 18:13:43 +10:00
Nyall Dawson
871ea87fc6 Fix deselecting features by clicking no feature 2016-07-08 17:41:55 +10:00
Nyall Dawson
ea3fc65c9d Avoid duplicate 'follow label placement' options in combo box 2016-07-08 17:41:55 +10:00
Nathan Woodrow
6c0afcd42e Move style dock button on toolbarst 2016-07-08 14:06:12 +10:00
Mathieu Pellerin
f31334f0cd Add myself (@nirvn) to contributor.json (#3284) 2016-07-08 11:47:28 +10:00
Nathan Woodrow
b1de246e84 const fixes 2016-07-08 10:54:58 +10:00
Even Rouault
5a033836d1 Update with my own long/lat coords... 2016-07-08 02:27:56 +02:00
Even Rouault
e1211320aa Add myself to contributors.json and AUTHORS 2016-07-08 02:23:20 +02:00