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
22,399 Commits 82 Branches 277 Tags
Commit Graph

248 Commits

Author SHA1 Message Date
Larry Shaffer
30fff85703 Define QGIS_MACAPP_BUNDLE in qgsconfig.h so resources can be found when QGIS_MACAPP_BUNDLE=0 2014-02-22 15:02:51 -07:00
Juergen E. Fischer
0881750565 Bump version to 2.3 2014-02-22 09:49:29 +01:00
Juergen E. Fischer
3e5ff1f9eb set minimum Qt version to 4.7 and remove #ifdef code depending on prior versions 2013-11-30 10:52:15 +01:00
Juergen E. Fischer
d02e47339b report found Qt version on build 2013-11-14 09:14:18 +01:00
Larry Shaffer
3fce4a5c0a Add extra CXXFLAGS flags set by user; can be -D CXX_EXTRA_FLAGS or environment variable 
- Command line -D option overrides environment variable
- Useful for suppressing transient upstream warnings in dependencies, like Qt
 2013-09-24 15:42:04 -06:00
Larry Shaffer
546b8d2397 [globe] Fix Mac dependencies so plugin can run from app bundle 2013-09-14 10:04:48 -06:00
Juergen E. Fischer
22512b29bb install qbrowser manpage 2013-09-10 23:20:00 +02:00
Larry Shaffer
1942239049 [Android] Change order of finding QtMobility package so Qt isn't 'found' twice 2013-09-09 17:15:38 -06:00
Juergen E. Fischer
0a1d44fc63 make qgis_app a shared library and fix some more stl warnings with msvc 2013-09-07 00:22:10 +02:00
Tim Sutton
96a1b862b8 Bumped master version to 2.1.0 2013-09-04 22:50:30 +02:00
Larry Shaffer
6e197484ed [pyqgis-console] Fix build error. Revert adding of qsci-pap-master target 
- Leave only qsci-pap-src target for updating default pyqgis.pap in source tree
- Mark WITH_QSCIAPI as advanced in CMake, since it mostly a dev function
 2013-08-31 14:05:08 -06:00
Larry Shaffer
dc4628599e [pyqgis-console] Add targets and python script for generating console's QScintilla .pap file, for auto-completion 
- Run 'make;make qsci-pap-src; make install' to update the default .pap file in source tree
- Run 'make;make qsci-pap-master[; make install]' for local-only .pap that overrides the default .pap (when testing new bindings)
- Update console to override default .pap if master.pap is available
- Include new qgis.core.NULL attribute defined in <src>/python/__init__.py for QPyNullVariant comparisons
- Update 11-month-old default .pap
 2013-08-30 13:12:38 -06:00
Juergen E. Fischer
5c80e50f42 raise Qt dependency to 4.5 2013-07-27 16:48:28 +02:00
Juergen E. Fischer
67376d14d9 raise cmake dependency to 2.8 2013-07-21 21:45:20 +02:00
Nathan Woodrow
bb8e47fc84 Change build path.txt to be more unique 2013-06-16 22:45:39 +10:00
Juergen E. Fischer
4d3d678080 introduce MAPSERVER_SKIP_ECW setting to disable ECW support in mapserver 2013-05-22 14:17:12 +02:00
Juergen E. Fischer
65d3535fc5 - Quantum GIS => QGIS update 
- integrate PythonConsole help into main translation
- allow referencing QGIS images in context help(viewer)
 2013-05-20 16:48:51 +02:00
Juergen E. Fischer
2db0f62de8 spatialite isn't optional anymore (offlineediting, osm): 
- remove configuration options
 2013-04-07 23:14:25 +02:00
Juergen E. Fischer
82a36f9cbe adjustments to build on cygwin 2013-04-06 18:30:28 +02:00
William Kyngesburye
00c5edf217 always search /Library/Frameworks for linking on OS X in case SDK won't 2013-04-01 16:24:57 -05:00
Larry Shaffer
691322a8eb Disable 'overloaded virtual' warning globally when using clang 
- Commit 1145bd2 now causing 200+ 'overloaded virtual' warnings
 2013-03-18 15:30:46 -06:00
Larry Shaffer
d7d1ecec1a Revert unnecessary disabling of unknown warnings 2013-03-12 18:07:02 -06:00
Larry Shaffer
28e17159d1 Fix for #7289, add CMake option to enable building with Qt jom (nmake) on Windows 
- Can now compile using NMake with jom directly from QtCreator using MSVC compiler (2008) and OSGeo4W devel libs
- Make app capable of running from build directory
- Caveat: may be better way to do it; could have better warning control
 2013-03-08 19:57:40 -07:00
Juergen E. Fischer
24ba638af6 Make QSPATIALITE optional, but still include it in osgeo4w and debian package 2013-02-19 20:07:57 +01:00
Larry Shaffer
e33bd25c62 Merge pull request #418 from dakcarto/cmake_stagedplugins-optmz_2 
Update stage-installed plugins CMakeLists.txt
 2013-02-18 19:01:23 -08:00
Juergen E. Fischer
554250473c [FEATURE] add qspatialite sql driver plugin 2013-02-17 22:15:00 +01:00
Juergen E. Fischer
7551aa71d2 fix warning 2013-02-07 13:14:59 +01:00
Juergen E. Fischer
8a880cadc3 use CMAKE_*_FLAGS also on unix 2013-02-03 21:20:26 +01:00
Larry Shaffer
7717aeed1c Update stage-installed plugins CMakeLists.txt 2013-02-03 03:42:12 -07:00
Larry Shaffer
8e7db454a1 Fix build error under clang on Mac 
- Remove APPLE_CLANG_WARNINGS option
- Add warnings via flags instead of definitions
 2013-02-02 17:09:43 -07:00
Juergen E. Fischer
63cc49be61 fix warnings brought up by clang 2013-02-02 17:06:22 +01:00
Larry Shaffer
0866c6c087 Add CMake option whether to show extra warnings from clang on Apple 
- Set APPLE_CLANG_WARNINGS:BOOL=FALSE to not show extra warnings (TRUE by default)
 2013-02-01 16:46:11 -07:00
Juergen E. Fischer
2fc799b98c [FEATURE] add oracle provider 2013-01-09 16:47:01 +01:00
Juergen E. Fischer
4f0fe1b80a wfs in core needs expat 2013-01-04 23:08:59 +01:00
Larry Shaffer
d56b1c885f Add CMake option for custom Python framework on Mac 2012-12-22 15:37:14 -07:00
Juergen E. Fischer
dcef083826 apply revised #6613 2012-11-03 21:51:21 +01:00
Larry Shaffer
d7a7a46afa Add CMake option WITH_STAGED_PLUGINS (ON by default) 
- Core plugins remain available once staged (no need to re-build targets, unless source updated or build directory cleared)
- Once plugins are staged, setting WITH_STAGED_PLUGINS to OFF allows for much quicker subsequent builds
- PyQGIS utilities, console and installer are always staged, regardless of WITH_STAGED_PLUGINS
 2012-10-30 18:39:22 -06:00
Larry Shaffer
9918350783 Revert part of a27aad0, not compatible with generated makefiles for GCC 4.2.1 2012-10-30 17:34:55 -06:00
Larry Shaffer
a27aad04f6 Run Mac bundled app from build directory 
- No longer a need for hard link
- Build directory app bundle, providers, Python plugins and unit tests functional
- Adjusted resources corrected on install
 2012-10-29 03:05:10 -06:00
Larry Shaffer
1fdaa04557 Add cmake option WITH_PY_COMPILE (OFF by default) 
- Byte-compiles staged and intalled plugins/modules
 2012-10-26 04:04:12 -06:00
Larry Shaffer
4ed1a66ddf Redo of 3ce27d6, hard-link to Mac embedded app bundle binary 2012-10-25 14:49:36 -06:00
Larry Shaffer
3ce27d6ecc Hard-link to Mac embedded app bundle binary 
- Allows QGIS to be run directly from build directory
- Link made at <build dir>/output/bin/QGIS
 2012-10-25 02:55:50 -06:00
Radim Blazek
e210a57101 QgsError for better error propagation to user, started using for rasters 2012-10-24 13:59:19 +02:00
Larry Shaffer
e8edb950e4 Add CMake finds for QScintilla2 and Qsci module 
- Needs testing on Windows platform
- Add QScintilla2 library version info to About dialog
- Add Mac bundling support for Qwt 6 framework and QScintilla2
- Fallback to sys or custom site-pkgs when looking for PyQt4 modules to Mac bundle
 2012-10-22 20:45:14 -06:00
Pirmin Kalberer
be7504459e Optional use of external osgEarthQt 2012-10-19 02:03:42 +02:00
Larry Shaffer
064c0c054b PyQScintilla api files setup for local compiling of pap file 
- Update and concatenate sip-built api files into PyQGIS.api
- Move python/qgis/api to python/qsci_apis for future api selection and compiling module
- Add base version api files for python components
 2012-10-04 15:06:25 -06:00
Radim Blazek
9286429baa - QgsRenderChecker moved to core + Python bindings 
- raster transparency python test
 2012-09-04 20:31:59 +02:00
Larry Shaffer
096badd94f Revert most Mac hacks for testing in favor of 4cfc365 
- Cleanup of old .qml svg paths to matches other test data .qml
 2012-08-26 17:27:18 -06:00
Juergen E. Fischer
4cfc365477 make tests runable without install 2012-08-26 20:19:19 +02:00
Juergen E. Fischer
24603eafd8 handle min()/max() macros offending std::numeric_limits<T>::min()/max() on MSVC in one spot 2012-08-18 19:45:07 +02:00