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

64 Commits

Author SHA1 Message Date
wonder
46a2d125a2 Merged refactoring branch back to trunk. 
git-svn-id: http://svn.osgeo.org/qgis/trunk@6415 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2007-01-09 02:39:15 +00:00
telwertowski
3388363866 Enable compilation using GEOS 3 as well as GEOS 2. 
git-svn-id: http://svn.osgeo.org/qgis/trunk@6274 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2006-12-18 06:06:48 +00:00
g_j_m
c354c40ba7 Fail if the Qt version is less than 4.2 (since the code now requires 4.2) 
git-svn-id: http://svn.osgeo.org/qgis/trunk@6147 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2006-11-29 19:32:16 +00:00
g_j_m
edafcc3803 Apply patch submitted in ticket #388. Thanks. 
git-svn-id: http://svn.osgeo.org/qgis/trunk@6086 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2006-11-15 08:02:04 +00:00
gsherman
46e6cfe4af Detect Qt for NetBSD (same as FreeBSD detection at present) -- patch from Brook Milligan. 
git-svn-id: http://svn.osgeo.org/qgis/trunk@6073 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2006-11-11 00:06:17 +00:00
mhugent
25d1ddf623 Another fix for gml multipolygon reading and hopefully a fix for the build system 
git-svn-id: http://svn.osgeo.org/qgis/trunk@5912 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2006-10-04 09:52:36 +00:00
mhugent
c1907b3b5c Added a --with-wfs switch to the auto* build system to compile the wfs plugin 
git-svn-id: http://svn.osgeo.org/qgis/trunk@5906 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2006-10-02 09:34:55 +00:00
morb_au
d6d5a76025 Windows build cross-compiling (from Linux) improvements: 
* If postgres is not requested in the autogen/configure, do not attempt to build the geoprocessing and spit plugins (they have no meaning if postgres is not available).

* Rearrange the acinclude (configure) test for the Qt version so that the Qt/Windows version is tested first.  This resolves an issue when the Qt/Windows library is mounted on the linux compiler platform as smbfs, where case-insensitive matching was triggered; therefore allowing the Qt/Windows-style includes to be mis-detected as Qt/X11-style includes.


git-svn-id: http://svn.osgeo.org/qgis/trunk@5830 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2006-09-16 07:08:08 +00:00
telwertowski
8d4a472f8d Add support for Qt/Mac 4.2. QtDesigner and QtTest are frameworks in 4.2 but libraries in prior Qt versions. 
git-svn-id: http://svn.osgeo.org/qgis/trunk@5760 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2006-09-05 03:13:39 +00:00
g_j_m
b10d248b4c Explicitly allow for Qt 4.2 in checks 
git-svn-id: http://svn.osgeo.org/qgis/trunk@5747 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2006-09-01 11:19:43 +00:00
rblazek
68ec30cb0e disabled --with-qt-pkg-config because PKG_CHECK_MODULES is not defined on many systems 
git-svn-id: http://svn.osgeo.org/qgis/trunk@5673 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2006-08-08 11:50:39 +00:00
timlinux
cc5ae8e4e1 Fix for building qgis on debian based systems where qt3-mt lib was also present and was getting linked to cause qgis to segfault. 
Update build.sh so that it now has an option to build static binary (use xstatic) - though this does not fully work on dapper as sqlite3 (and perhaps others) dont supply statically build versions of their libs in their pacakges.
Lastly, build.sh now uses --enable-static=no option when running autogen.sh so that qgis does no build or link to static versions of its own libs which speeds up compilation time.


git-svn-id: http://svn.osgeo.org/qgis/trunk@5294 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2006-04-17 01:04:40 +00:00
wonder
e6656035dd Qt4 detection by using pkg-config is not default anymore, to enable it, use --with-qt-pkg-config 
Added support for QtTest in pkg-config detection.


git-svn-id: http://svn.osgeo.org/qgis/trunk@5257 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2006-04-11 09:58:33 +00:00
telwertowski
816f2e9039 Fix Mac references to QtDesigner and QtTest; these are libraries and not frameworks. (Note: the line beginning "dependency_libs=" in $QTDIR/lib/libQtTest.la must also be disabled to avoid a Mac glibtool bug.) 
git-svn-id: http://svn.osgeo.org/qgis/trunk@5225 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2006-04-08 06:36:02 +00:00
rblazek
8c0cb25668 mingw requires full lib name: QtTest4/QtDesigner4 
git-svn-id: http://svn.osgeo.org/qgis/trunk@5196 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2006-04-06 13:42:23 +00:00
timlinux
2b6b2eb8ce Add -lQtDesigner and relevant includes to that designer plugins can be built 
git-svn-id: http://svn.osgeo.org/qgis/trunk@5132 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2006-04-02 20:37:56 +00:00
timlinux
7aae2b265e Yet another bugfix - repair typo in -lQtTest and add -lQtTest to mingw build too 
git-svn-id: http://svn.osgeo.org/qgis/trunk@5126 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2006-04-01 11:30:14 +00:00
timlinux
b7f21c3dd6 Fix small bug with overridden QT4_SVGINC var being overridden by QtTest 
git-svn-id: http://svn.osgeo.org/qgis/trunk@5125 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2006-04-01 11:24:55 +00:00
timlinux
94283933f7 Updated to support qt4 installed via apt on debian /ubuntu systems 
Added QtTest includes and libraries to build



git-svn-id: http://svn.osgeo.org/qgis/trunk@5124 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2006-04-01 11:10:19 +00:00
rblazek
aa93b65920 reverted hack for 64bit, it was causing fail on 64bit machines and packages compiled without libdir option (default) and for mingw32 on 64bit machine 
git-svn-id: http://svn.osgeo.org/qgis/trunk@5119 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2006-03-30 12:21:18 +00:00
timlinux
25a4e5b223 Apply Ticket #27: acinclude_m4_64bit.patch 
git-svn-id: http://svn.osgeo.org/qgis/trunk@5110 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2006-03-29 16:12:10 +00:00
wonder
f641c58526 small fix that resolves redundant compiler/linker flags from pkg-config 
git-svn-id: http://svn.osgeo.org/qgis/trunk@5037 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2006-03-16 14:08:54 +00:00
wonder
3e46f18f62 Qt4 detection in configure script using pkgconfig. 
git-svn-id: http://svn.osgeo.org/qgis/trunk@5008 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2006-03-12 10:14:03 +00:00
telwertowski
73b5e3ac46 Add extra path info to help Mac OS X find the right Python.h and compile msexport. Previously, it was doing nothing because it found multiple directories where it expected one. 
git-svn-id: http://svn.osgeo.org/qgis/trunk@4991 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2006-03-10 00:47:13 +00:00
rblazek
b0b414461b fix for crosscompilation 
git-svn-id: http://svn.osgeo.org/qgis/trunk@4726 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2006-01-23 16:36:58 +00:00
morb_au
ab2e7593d7 Make "--with-qtdir" work better in ./configure. 
Previously if your --with-qtdir was not in your PATH, ./configure would pick up the uic that was in your path anyway.  Now uic and rcc are forced to those found inside whatever you specify with --with-qtdir.
-This line, and those below, will be ignored--

M    qgis/acinclude.m4


git-svn-id: http://svn.osgeo.org/qgis/trunk@4719 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2006-01-22 21:57:09 +00:00
g_j_m
428aeb47ea Add svg library and include stuff for Darwin 
git-svn-id: http://svn.osgeo.org/qgis/trunk@4714 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2006-01-21 23:00:01 +00:00
g_j_m
9acfe503a0 Attempt to include required stuff for Qt Svg 
git-svn-id: http://svn.osgeo.org/qgis/trunk@4713 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2006-01-21 22:53:22 +00:00
rblazek
037a737d8e fixes for cross compilation with MinGW 
git-svn-id: http://svn.osgeo.org/qgis/trunk@4647 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2006-01-11 16:34:40 +00:00
gsherman
f174784046 Throw an error in configure if Qt 4.1 is not detected. 
git-svn-id: http://svn.osgeo.org/qgis/trunk@4493 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2006-01-07 02:48:57 +00:00
gsherman
4b6a5a9d9d Merge UI conversion branch to HEAD. UI branch is now deprecated. 
git-svn-id: http://svn.osgeo.org/qgis/trunk@4409 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2005-12-30 04:56:31 +00:00
gsherman
d5fb0e2e98 Quick change to fail configure if Qt 4 is not found. Additional cleanup 
to the Qt detection code is required to complete the migration from
version 3.x to 4.x.


git-svn-id: http://svn.osgeo.org/qgis/trunk@4267 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2005-11-25 17:53:29 +00:00
telwertowski
a84eaad45d Add build support for Qt4/Mac. 
(The environment variable QTDIR should be defined similar to /usr/local/Trolltech/Qt-4.0.1 for Qt4 and /Developer/qt for Qt3.)


git-svn-id: http://svn.osgeo.org/qgis/trunk@4255 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2005-11-21 23:54:16 +00:00
shalasz
888e7533ab Find libQtCore on Debian 
git-svn-id: http://svn.osgeo.org/qgis/trunk@4236 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2005-11-20 01:55:31 +00:00
shalasz
adfa3e6e67 Look for uic3 in PATH as well 
git-svn-id: http://svn.osgeo.org/qgis/trunk@4235 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2005-11-20 01:37:33 +00:00
gsherman
8882b66aff Added check for Qt 4.1x in addition to 4.0.x 
git-svn-id: http://svn.osgeo.org/qgis/trunk@4231 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2005-11-19 05:27:48 +00:00
gsherman
ab90a5f9ca Python configuration changes 
git-svn-id: http://svn.osgeo.org/qgis/trunk@4201 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2005-11-12 03:37:11 +00:00
gsherman
2d69c5c43f Added support for python to the build system. Don't get too excited, 
this isn't used anywhere yet...


git-svn-id: http://svn.osgeo.org/qgis/trunk@4199 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2005-11-12 01:10:00 +00:00
morb_au
0468ae83d8 More changes for Qt4 porting readiness. 
git-svn-id: http://svn.osgeo.org/qgis/trunk@3948 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2005-09-21 21:11:18 +00:00
morb_au
13ac170651 Initial conversion of the build system to recognise Qt4.0.0 as a build option. For example, if you've "make install"ed Qt4, you can try using ./configure "--with-qtdir=/usr/local/Trolltech/Qt-4.0.0". 
It's HIGHLY RECOMMENDED to build against Qt4 in a *copy* of your CVS working directory as you will still have to run qt3to4 from the qgis root directory (e.g. "/usr/local/Trolltech/Qt-4.0.0/bin/qt3to4 qgis.pro") before you "make", and this change is difficult to undo.

Please continue to commit new code that is Qt3.3 compatible, NOT Qt4 only.

Note that qgis doesn't actually build against Qt4 yet; this is a change to the build system only, not the code.


git-svn-id: http://svn.osgeo.org/qgis/trunk@3809 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2005-08-02 21:48:54 +00:00
larsl
4b789f179e Changed the check for GSL so it doesn't require pkg-config 
git-svn-id: http://svn.osgeo.org/qgis/trunk@3401 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2005-05-15 23:56:33 +00:00
jobi
a08e5afd4a - fixed typo 
git-svn-id: http://svn.osgeo.org/qgis/trunk@3377 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2005-05-13 21:50:32 +00:00
jobi
cad19f874f Tweak of makefiles and prepared for a release. 
git-svn-id: http://svn.osgeo.org/qgis/trunk@3376 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2005-05-13 21:39:20 +00:00
gsherman
52878758a9 Added message at end of configure to indicate the Qt directory that 
will be used to build QGIS. Hopefully this will remind me (and others)
to ensure minimum Qt compatibility (currently @ version 3.1.2).


git-svn-id: http://svn.osgeo.org/qgis/trunk@3029 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2005-03-25 18:59:43 +00:00
jobi
14b2185e58 - fix for building on 64bit architecture 
- fixed dependencies of designer-plugin/stuff


git-svn-id: http://svn.osgeo.org/qgis/trunk@2956 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2005-03-13 14:24:48 +00:00
timlinux
1c8479cae3 Allow geos 2.x.x instead of geos 2.0.x 
git-svn-id: http://svn.osgeo.org/qgis/trunk@2376 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2004-11-29 23:05:44 +00:00
gsherman
ae7a3a4bf3 Applied patches from Markus and strk 
git-svn-id: http://svn.osgeo.org/qgis/trunk@2341 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2004-11-26 20:31:49 +00:00
jobi
64de53a52b - version detection for geos 
- display versions of geos, gdal and postgresql


git-svn-id: http://svn.osgeo.org/qgis/trunk@2173 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2004-10-25 20:44:53 +00:00
gsherman
d9d19acbfa Added test for GEOS to acinclude 
Included GEOS in configure.in


git-svn-id: http://svn.osgeo.org/qgis/trunk@2148 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2004-10-19 05:03:44 +00:00
jobi
1d3ad4697f some cosmetics 
git-svn-id: http://svn.osgeo.org/qgis/trunk@1709 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2004-06-30 09:47:40 +00:00