sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity
29,811 Commits 82 Branches 277 Tags
Commit Graph

239 Commits

Author SHA1 Message Date
Matthias Kuhn
b1eb812792 Do not require manual CMakeCache intervention 2015-11-19 08:35:13 +01:00
Matthias Kuhn
eeef84b1f7 Revert "Deduplicated FindPyQt(4|5).py" 
This reverts commit 842c17c10b2112b0d92ab287d76e374900736065 which was
responsible for test timeouts for dubious reasons.
 2015-11-17 13:57:11 +01:00
Juergen E. Fischer
1675703ddb qt5 fixes 2015-11-17 01:00:08 +01:00
Juergen E. Fischer
51295273ff fix pyrcc4 detection on windows (followup 0b6dd352) 2015-11-16 17:16:46 +01:00
Matthias Kuhn
842c17c10b Deduplicated FindPyQt(4|5).py 2015-11-16 07:42:48 +01:00
Matthias Kuhn
0b6dd352c9 [py3] CMake updates to support Python3 and PyQt5 2015-11-16 07:42:47 +01:00
Matthias Kuhn
f1fe98558a [qt5] Fix QCA Cmake 2015-11-12 14:14:03 +01:00
Matthias Kuhn
1bb7aff067 [qt5] Fix QScintilla cmake file 2015-11-12 14:14:03 +01:00
Juergen E. Fischer
9d97c7c41b fix typo in python test invocation 2015-11-08 18:03:22 +00:00
Denis Rouzaud
8030746674 find libraries for Qt5 2015-11-07 11:32:23 -05:00
Matthias Kuhn
cd0eb05ded [py3] Some compatibility fixes for python 3 2015-10-24 13:47:32 +02:00
Radim Blazek
ca70491363 [GRASS] try to get off_t from Make/platform.h 2015-10-22 11:01:07 +02:00
Radim Blazek
898a738451 [GRASS] cmake add check if version.h exists 2015-10-20 18:54:29 +02:00
Radim Blazek
e37ae8bad0 [GRASS] cmake fix 2015-10-18 14:22:49 +02:00
Radim Blazek
60efb82e6e [GRASS] get off_t size 2015-10-17 12:31:57 +02:00
Sandro Mani
643eb1000d Remove GEOS C++ lib dependency 2015-10-07 23:33:56 +02:00
Matthias Kuhn
01b4554079 Qt5: Fix lrelease vs. lrelease-qt5 problem 2015-10-04 11:30:03 +02:00
Larry Shaffer
aa0a47a5b2 Add symlink resolving to install name change bundle function on Mac 2015-10-01 17:33:33 -06:00
Nyall Dawson
228d816b3b Merge pull request #2330 from boundlessgeo/master-2_11-auth-system 
Authentication configuration system with master password
 2015-09-26 05:45:28 +10:00
Larry Shaffer
e65aa99ae7 [FEATURE] Authentication configuration system with master password 
- Main C++ core and gui classes and desktop app integration
- Support for authentication method plugins
- Does not contain any integration with service connections
 2015-09-21 08:51:18 -06:00
Sandro Mani
9fef5a16ae Make GEOS CPP optional 2015-09-21 10:03:25 +02:00
Juergen E. Fischer
b165875fa6 spelling fixes 2015-07-26 14:39:30 +02:00
Juergen E. Fischer
789da22478 don't buffer python and grass tests output in variables 2015-07-18 15:32:37 +02:00
Juergen E. Fischer
2e772b2c55 fix qgsversion.h generation [take II] 2015-07-15 07:50:58 +02:00
William Kyngesburye
fdce0ac8cd update Mac bundling for GRASS 6/7 lib split 2015-06-30 21:22:49 -05:00
Nyall Dawson
c391fcd81c Avoid cmake CMP0026 warning on Win32 by replacing disallowed LOCATION 
target property
 2015-06-19 13:10:02 +10:00
Juergen E. Fischer
d4b72a2d7b depend on spatialite_init_ex() for 'new' spatialite initialization (followup 252aaab) 2015-05-27 20:45:15 +02:00
Radim Blazek
9e5b2ba511 [GRASS] create imagery group if there are rgb color interpretations, list groups in browser 2015-05-26 12:43:20 +02:00
Matthias Kuhn
c0090d8cfe Also let CMake find grass libs in default system location 2015-05-01 16:18:00 +02:00
Radim Blazek
7d4eb8bce3 [GRASS] multi version build 2015-04-07 11:05:10 +02:00
Matthias Kuhn
66ba219fd3 Find qwt6-qt4 library 
Fix #12374
 2015-03-18 18:04:35 +01:00
Juergen E. Fischer
f4b3ad033a use PyQt4 where deprecated pyqtconfig is unavailable (fixes #10596 and fixes #11465) 2015-02-25 19:32:54 +01:00
Larry Shaffer
da76270174 Add qgis.server to PyQGIS console .api file generation 2015-02-20 15:49:14 -07:00
Larry Shaffer
4b076290fe Update Mac bundling for qgis_server lib 2015-02-20 15:49:14 -07:00
Tim Sutton
e1508c1e6a Use cmake variable rather than env var for QGIS Cmake Find rules when using a custom QGIS prefix. 2015-02-19 23:44:08 +02:00
Tim Sutton
810edb7f92 Added support for finding QGIS in QGIS_PREFIX_PATH when using FindQGIS.cmake 2015-02-19 23:44:08 +02:00
Juergen E. Fischer
956c155e8f fix python pep8 warnings and fix some revealed errors 
pep8 --ignore=E111,E128,E201,E202,E203,E211,E221,E222,E225,E226,E227,E231,E241,E261,E265,E272,E302,E303,E501,E701 \
     --exclude="ui_*.py,debian/*,python/ext-libs/*" \
     .
 2015-02-01 20:46:47 +01:00
Denis Rouzaud
d8acc55a49 Fix Qt5 build for custom widgets 2015-01-06 17:03:27 +01:00
Larry Shaffer
a4aaff5d53 Fix CMake policy warnings/changes introduced in 3.0.0 and higher 2014-12-22 17:06:13 -07:00
Nyall Dawson
a435441239 Add support for generating coverage statistics for tests 
Build option ENABLE_COVERAGE must be set. There's also a secondary
option GENERATE_COVERAGE_DOCS which requires lcov and will generate
html docs of unit test coverage.

To generate coverage, first enable the cmake options, then build
QGIS. From the build directory, run "make qgis_coverage".

You can also add command line arguments to "make qgis_coverage" which
are forwarded on to ctest. This allows for skipping failing tests
which prevent generation of coverage docs. This is done by adding
the command line argument CMD_ARGS= to the "make qgis_coverage"
command. Eg,

make qgis_coverage CMD_ARGS="-E \"PalLabeling|LocalServer|AppStartup\"

will skip tests which match the listed expressions.
 2014-12-04 07:45:22 +11:00
Juergen E. Fischer
6a1e1bb668 * fix server plugin build on windows 
* move src/mapserver to src/server (IMHO better name and in sync with
  python/server)
* rename cmake option WITH_MAPSERVER to WITH_SERVER
* rename define MAPSERVER_HAVE_PYTHON_PLUGINS to HAVE_SERVER_PYTHON_PLUGINS
 2014-11-28 16:46:29 +01:00
Matthias Kuhn
78c519546a Add Qt5 support 2014-11-21 11:45:32 +01:00
Martin Dobias
e4ab3f2aea Merge remote-tracking branch 'rouault/use_geos_reentrant_api' 
Conflicts:
	src/core/pal/layer.cpp
	src/core/qgsgeometry.cpp
	src/core/qgspallabeling.cpp
 2014-09-13 19:28:25 +07:00
Juergen E. Fischer
00ca017def Fix GEOS dev detection (fixes #11081) 2014-08-30 08:09:30 +02:00
Jarl Friis
04bb461746 Finding python library on Ubuntu 14.04 64bit 2014-08-06 13:36:45 +02:00
Larry Shaffer
9a10b79354 Fix finding QScintilla for non-QT_INCLUDE_DIR install directories 2014-07-23 16:12:39 -06:00
Juergen E. Fischer
3988ad0f63 make sip bindings to qscintilla derived classes optional (replaces 7e815cad & 8f0b8987) 2014-07-23 19:03:42 +02:00
Juergen E. Fischer
1692cc36b9 cmake: report geos version with c-api header only (followup 0529f117) 2014-07-15 15:29:04 +02:00
Juergen E. Fischer
0529f117d1 cmake: report geos version 2014-07-15 13:29:19 +02:00
Nyall Dawson
e13e9f7487 Make QScintilla a required dependency 2014-07-07 21:15:41 +10:00