mxe-octave: src/qt-win32.patch annotate

annotate src/qt-win32.patch @ 576:d262f9cc5821

some more improvements for package qt (by Mark Brand)

author	Volker Grabsch <vog@notjusthosting.com>
date	Fri, 04 Dec 2009 22:24:17 +0100
parents	bdd31b51843e
children	41c0ac9326f2

rev	line source
452 ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	1 Copyright (C) 2009 Mark Brand
464 0174ea97b91d several bugfixes for package qt to ensure that "i686-pc-mingw32-qmake ; make" will work Volker Grabsch <vog@notjusthosting.com> parents: 452 diff changeset	2 Volker Grabsch
470 a07d9f69e2ee add OpenGL support to package qt (by Martin Lambers) Volker Grabsch <vog@notjusthosting.com> parents: 469 diff changeset	3 Martin Lambers
452 ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	4
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	5 Permission is hereby granted, free of charge, to any person obtaining
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	6 a copy of this software and associated documentation files (the
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	7 "Software"), to deal in the Software without restriction, including
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	8 without limitation the rights to use, copy, modify, merge, publish,
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	9 distribute, sublicense, and/or sell copies of the Software, and to
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	10 permit persons to whom the Software is furnished to do so, subject
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	11 to the following conditions:
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	12
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	13 The above copyright notice and this permission notice shall be
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	14 included in all copies or substantial portions of the Software.
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	15
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	16 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	17 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	18 MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	19 IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	20 CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	21 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	22 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	23
564 c67df741dfa7 update version of package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 548 diff changeset	24 diff -urN a/configure b/configure
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	25 --- a/configure 2009-11-27 02:27:48.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	26 +++ b/configure 2009-12-04 10:30:44.000000000 +0100
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	27 @@ -591,7 +591,7 @@
452 ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	28 rm -f "$outpath/config.tests/.qmake.cache"
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	29 cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache"
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	30
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	31 -QMakeVar add styles "cde mac motif plastique cleanlooks windows"
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	32 +QMakeVar add styles "cde mac motif plastique cleanlooks windows windowsxp windowsvista"
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	33 QMakeVar add decorations "default windows styled"
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	34 QMakeVar add mouse-drivers "pc"
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	35 if [ "$UNAME_SYSTEM" = "Linux" ] ; then
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	36 @@ -717,6 +717,7 @@
524 28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	37 CFG_3DNOW=auto
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	38 CFG_SSE=auto
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	39 CFG_SSE2=auto
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	40 +CFG_RTTI=auto
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	41 CFG_REDUCE_RELOCATIONS=no
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	42 CFG_IPV6=auto
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	43 CFG_NAS=no
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	44 @@ -4424,7 +4425,10 @@
548 08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	45 #-------------------------------------------------------------------------------
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	46
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	47 # detect availability of float math.h functions
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	48 -if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/floatmath "floatmath" $L_FLAGS $I_FLAGS $l_FLAGS; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	49 +if [ "$XPLATFORM" = "win32-g++" ]; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	50 + echo "Using FLOATMATH for win32-g++ target"
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	51 + CFG_USE_FLOATMATH=yes
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	52 +elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/floatmath "floatmath" $L_FLAGS $I_FLAGS $l_FLAGS; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	53 CFG_USE_FLOATMATH=yes
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	54 else
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	55 CFG_USE_FLOATMATH=no
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	56 @@ -4432,7 +4436,10 @@
524 28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	57
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	58 # detect mmx support
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	59 if [ "${CFG_MMX}" = "auto" ]; then
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	60 - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/mmx "mmx" $L_FLAGS $I_FLAGS $l_FLAGS "-mmmx"; then
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	61 + if [ "$XPLATFORM" = "win32-g++" ]; then
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	62 + echo "Using MMX for win32-g++ target"
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	63 + CFG_MMX=yes
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	64 + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/mmx "mmx" $L_FLAGS $I_FLAGS $l_FLAGS "-mmmx"; then
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	65 CFG_MMX=yes
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	66 else
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	67 CFG_MMX=no
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	68 @@ -4441,7 +4448,10 @@
524 28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	69
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	70 # detect 3dnow support
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	71 if [ "${CFG_3DNOW}" = "auto" ]; then
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	72 - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/3dnow "3dnow" $L_FLAGS $I_FLAGS $l_FLAGS "-m3dnow"; then
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	73 + if [ "$XPLATFORM" = "win32-g++" ]; then
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	74 + echo "Using SSE for win32-g++ target"
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	75 + CFG_3DNOW=yes
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	76 + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/3dnow "3dnow" $L_FLAGS $I_FLAGS $l_FLAGS "-m3dnow"; then
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	77 CFG_3DNOW=yes
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	78 else
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	79 CFG_3DNOW=no
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	80 @@ -4450,7 +4460,10 @@
524 28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	81
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	82 # detect sse support
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	83 if [ "${CFG_SSE}" = "auto" ]; then
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	84 - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sse "sse" $L_FLAGS $I_FLAGS $l_FLAGS "-msse"; then
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	85 + if [ "$XPLATFORM" = "win32-g++" ]; then
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	86 + echo "Using SSE for win32-g++ target"
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	87 + CFG_SSE=yes
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	88 + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sse "sse" $L_FLAGS $I_FLAGS $l_FLAGS "-msse"; then
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	89 CFG_SSE=yes
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	90 else
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	91 CFG_SSE=no
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	92 @@ -4459,13 +4472,26 @@
524 28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	93
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	94 # detect sse2 support
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	95 if [ "${CFG_SSE2}" = "auto" ]; then
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	96 - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sse2 "sse2" $L_FLAGS $I_FLAGS $l_FLAGS "-msse2"; then
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	97 + if [ "$XPLATFORM" = "win32-g++" ]; then
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	98 + echo "Using SSE2 for win32-g++ target"
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	99 + CFG_SSE2=yes
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	100 + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sse2 "sse2" $L_FLAGS $I_FLAGS $l_FLAGS "-msse2"; then
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	101 CFG_SSE2=yes
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	102 else
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	103 CFG_SSE2=no
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	104 fi
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	105 fi
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	106
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	107 +# detect rtti support
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	108 +if [ "${CFG_RTTI}" = "auto" ]; then
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	109 + if [ "$XPLATFORM" = "win32-g++" ]; then
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	110 + echo "Using RTTI for win32-g++ target"
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	111 + CFG_RTTI=yes
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	112 + else
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	113 + CFG_RTTI=no
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	114 + fi
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	115 +fi
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	116 +
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	117 # check iWMMXt support
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	118 if [ "$CFG_IWMMXT" = "yes" ]; then
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	119 "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/iwmmxt "iwmmxt" $L_FLAGS $I_FLAGS $l_FLAGS "-mcpu=iwmmxt"
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	120 @@ -4491,7 +4517,10 @@
548 08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	121 ZLIB_FORCED=yes
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	122 fi
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	123 if [ "$CFG_ZLIB" = "auto" ]; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	124 - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/zlib "zlib" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	125 + if [ "$XPLATFORM" = "win32-g++" ]; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	126 + echo "We cannot test for system ZLIB since we are cross building for win32-g++, so we assume it is there."
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	127 + CFG_ZLIB=system
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	128 + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/zlib "zlib" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	129 CFG_ZLIB=system
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	130 else
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	131 CFG_ZLIB=yes
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	132 @@ -4508,7 +4537,10 @@
548 08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	133 fi
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	134 # detect jpeg
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	135 if [ "$CFG_LIBJPEG" = "auto" ]; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	136 - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libjpeg "libjpeg" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	137 + if [ "$XPLATFORM" = "win32-g++" ]; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	138 + echo "We cannot test for system LIBJPEG since we are cross building for win32-g++, so we assume it is there."
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	139 + CFG_LIBJPEG=system
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	140 + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libjpeg "libjpeg" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	141 CFG_LIBJPEG=system
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	142 else
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	143 CFG_LIBJPEG=qt
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	144 @@ -4535,7 +4567,10 @@
548 08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	145
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	146 # detect tiff
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	147 if [ "$CFG_LIBTIFF" = "auto" ]; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	148 - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libtiff "libtiff" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	149 + if [ "$XPLATFORM" = "win32-g++" ]; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	150 + echo "We cannot test for system LIBTIFF since we are cross building for win32-g++, so we assume it is there."
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	151 + CFG_LIBTIFF=system
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	152 + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libtiff "libtiff" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	153 CFG_LIBTIFF=system
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	154 else
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	155 CFG_LIBTIFF=qt
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	156 @@ -4552,7 +4587,10 @@
548 08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	157 fi
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	158 # detect mng
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	159 if [ "$CFG_LIBMNG" = "auto" ]; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	160 - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libmng "libmng" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	161 + if [ "$XPLATFORM" = "win32-g++" ]; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	162 + echo "We cannot test for system LIBMNG since we are cross building for win32-g++, so we assume it is there."
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	163 + CFG_LIBMNG=system
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	164 + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libmng "libmng" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	165 CFG_LIBMNG=system
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	166 else
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	167 CFG_LIBMNG=qt
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	168 @@ -4561,7 +4599,10 @@
548 08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	169
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	170 # detect png
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	171 if [ "$CFG_LIBPNG" = "auto" ]; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	172 - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libpng "libpng" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	173 + if [ "$XPLATFORM" = "win32-g++" ]; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	174 + echo "We cannot test for system LIBPNG since we are cross building for win32-g++, so we assume it is there."
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	175 + CFG_LIBPNG=system
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	176 + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libpng "libpng" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	177 CFG_LIBPNG=system
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	178 else
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	179 CFG_LIBPNG=qt
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	180 @@ -4628,7 +4669,10 @@
548 08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	181 fi
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	182 ;;
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	183 psql)
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	184 - if [ "$CFG_SQL_psql" != "no" ]; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	185 + if [ "$XPLATFORM" = "win32-g++" ]; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	186 + echo "We cannot test for PostgreSQL support since we are cross building for win32-g++, so we assume it is there."
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	187 + CFG_SQL_psql=plugin
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	188 + elif [ "$CFG_SQL_psql" != "no" ]; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	189 if "$WHICH" pg_config >/dev/null 2>&1; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	190 QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null`
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	191 QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null`
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	192 @@ -4656,7 +4700,10 @@
520 9294e8fad5e9 add ODBC support to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 509 diff changeset	193 ;;
9294e8fad5e9 add ODBC support to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 509 diff changeset	194 odbc)
9294e8fad5e9 add ODBC support to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 509 diff changeset	195 if [ "$CFG_SQL_odbc" != "no" ]; then
9294e8fad5e9 add ODBC support to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 509 diff changeset	196 - if [ "$PLATFORM_MAC" != "yes" ] && "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/odbc "ODBC" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
9294e8fad5e9 add ODBC support to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 509 diff changeset	197 + if [ "$XPLATFORM" = "win32-g++" ]; then
9294e8fad5e9 add ODBC support to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 509 diff changeset	198 + echo "We cannot test for ODBC support since we are cross building for win32-g++, so we assume it is there."
9294e8fad5e9 add ODBC support to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 509 diff changeset	199 + CFG_SQL_odbc=plugin
9294e8fad5e9 add ODBC support to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 509 diff changeset	200 + elif [ "$PLATFORM_MAC" != "yes" ] && "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/odbc "ODBC" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
9294e8fad5e9 add ODBC support to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 509 diff changeset	201 if [ "$CFG_SQL_odbc" = "auto" ]; then
9294e8fad5e9 add ODBC support to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 509 diff changeset	202 CFG_SQL_odbc=plugin
9294e8fad5e9 add ODBC support to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 509 diff changeset	203 fi
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	204 @@ -4701,7 +4748,12 @@
548 08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	205 ;;
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	206 tds)
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	207 if [ "$CFG_SQL_tds" != "no" ]; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	208 - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/tds "TDS" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	209 + if [ "$XPLATFORM" = "win32-g++" ]; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	210 + echo "We cannot test for TDS since we are cross building for win32-g++, so we assume it is there."
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	211 + if [ "CFG_SQL_tds" = "auto" ]; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	212 + CFG_SQL_tds=plugin
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	213 + fi
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	214 + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/tds "TDS" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	215 if [ "$CFG_SQL_tds" = "auto" ]; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	216 CFG_SQL_tds=plugin
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	217 fi
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	218 @@ -4783,7 +4835,13 @@
548 08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	219 QT_CFLAGS_SQLITE=`$PKG_CONFIG --cflags sqlite3 2>/dev/null`
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	220 QT_LFLAGS_SQLITE=`$PKG_CONFIG --libs sqlite3 2>/dev/null`
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	221 fi
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	222 - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sqlite "SQLite" $QT_LFLAGS_SQLITE $L_FLAGS $QT_CFLAGS_SQLITE $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	223 + if [ "$XPLATFORM" = "win32-g++" ]; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	224 + echo "We cannot test for system sqlite since we are cross building for win32-g++, so we assume it is there."
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	225 + if [ "$CFG_SQL_sqlite" = "auto" ]; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	226 + CFG_SQL_sqlite=plugin
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	227 + fi
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	228 + QMAKE_CONFIG="$QMAKE_CONFIG system-sqlite"
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	229 + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sqlite "SQLite" $QT_LFLAGS_SQLITE $L_FLAGS $QT_CFLAGS_SQLITE $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	230 if [ "$CFG_SQL_sqlite" = "auto" ]; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	231 CFG_SQL_sqlite=plugin
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	232 fi
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	233 @@ -4854,7 +4912,9 @@
548 08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	234
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	235 # auto-detect iconv(3) support
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	236 if [ "$CFG_ICONV" != "no" ]; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	237 - if [ "$PLATFORM_QWS" = "yes" ]; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	238 + if [ "$XPLATFORM" = "win32-g++" ]; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	239 + CFG_ICONV=no
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	240 + elif [ "$PLATFORM_QWS" = "yes" ]; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	241 CFG_ICONV=no
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	242 elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" "$OPT_VERBOSE" "$relpath" "$outpath" "config.tests/unix/iconv" "POSIX iconv" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	243 CFG_ICONV=yes
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	244 @@ -5014,7 +5074,9 @@
452 ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	245 echo "Basic XLib functionality test failed!"
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	246 echo " You might need to modify the include and library search paths by editing"
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	247 echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}."
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	248 - exit 1
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	249 +echo NOTICE: This is a specially modifed configure script!
471 db393d589865 more bugfixes for package qt Volker Grabsch <vog@notjusthosting.com> parents: 470 diff changeset	250 +echo For our purposes we do not want X11.
452 ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	251 +# exit 1
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	252 fi
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	253
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	254 # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x)
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	255 @@ -5088,7 +5150,9 @@
470 a07d9f69e2ee add OpenGL support to package qt (by Martin Lambers) Volker Grabsch <vog@notjusthosting.com> parents: 469 diff changeset	256 echo " You might need to modify the include and library search paths by editing"
a07d9f69e2ee add OpenGL support to package qt (by Martin Lambers) Volker Grabsch <vog@notjusthosting.com> parents: 469 diff changeset	257 echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in"
a07d9f69e2ee add OpenGL support to package qt (by Martin Lambers) Volker Grabsch <vog@notjusthosting.com> parents: 469 diff changeset	258 echo " ${XQMAKESPEC}."
a07d9f69e2ee add OpenGL support to package qt (by Martin Lambers) Volker Grabsch <vog@notjusthosting.com> parents: 469 diff changeset	259 - exit 1
a07d9f69e2ee add OpenGL support to package qt (by Martin Lambers) Volker Grabsch <vog@notjusthosting.com> parents: 469 diff changeset	260 +echo NOTICE: This is a specially modifed configure script!
a07d9f69e2ee add OpenGL support to package qt (by Martin Lambers) Volker Grabsch <vog@notjusthosting.com> parents: 469 diff changeset	261 +echo For our purposes we do not want the OpenGL functionality test.
a07d9f69e2ee add OpenGL support to package qt (by Martin Lambers) Volker Grabsch <vog@notjusthosting.com> parents: 469 diff changeset	262 +# exit 1
a07d9f69e2ee add OpenGL support to package qt (by Martin Lambers) Volker Grabsch <vog@notjusthosting.com> parents: 469 diff changeset	263 fi
a07d9f69e2ee add OpenGL support to package qt (by Martin Lambers) Volker Grabsch <vog@notjusthosting.com> parents: 469 diff changeset	264 case "$PLATFORM" in
a07d9f69e2ee add OpenGL support to package qt (by Martin Lambers) Volker Grabsch <vog@notjusthosting.com> parents: 469 diff changeset	265 hpux*)
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	266 @@ -5589,7 +5653,10 @@
548 08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	267 fi
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	268
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	269 HAVE_STL=no
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	270 -if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/stl "STL" $L_FLAGS $I_FLAGS $l_FLAGS; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	271 +if [ "$XPLATFORM" = "win32-g++" ]; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	272 + echo "Using STL for win32-g++ target"
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	273 + HAVE_STL=yes
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	274 +elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/stl "STL" $L_FLAGS $I_FLAGS $l_FLAGS; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	275 HAVE_STL=yes
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	276 fi
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	277
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	278 @@ -5611,7 +5678,10 @@
548 08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	279
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	280 # find if the platform supports IPv6
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	281 if [ "$CFG_IPV6" != "no" ]; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	282 - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/ipv6 "IPv6" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	283 + if [ "$XPLATFORM" = "win32-g++" ]; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	284 + echo "Using IPV6 for win32-g++ target"
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	285 + CFG_IPV6=yes
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	286 + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/ipv6 "IPv6" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	287 CFG_IPV6=yes
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	288 else
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	289 if [ "$CFG_IPV6" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	290 @@ -5725,7 +5795,10 @@
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	291
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	292 # find if the platform supports X/Open Large File compilation environment
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	293 if [ "$CFG_LARGEFILE" != "no" ]; then
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	294 - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/largefile "X/Open Large File" $L_FLAGS $I_FLAGS $l_FLAGS; then
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	295 + if [ "$XPLATFORM" = "win32-g++" ]; then
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	296 + echo "Using LARGEFILE for win32-g++ target"
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	297 + CFG_LARGEFILE=yes
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	298 + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/largefile "X/Open Large File" $L_FLAGS $I_FLAGS $l_FLAGS; then
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	299 CFG_LARGEFILE=yes
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	300 else
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	301 if [ "$CFG_LARGEFILE" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	302 @@ -5742,7 +5815,9 @@
548 08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	303
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	304 # detect OpenSSL
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	305 if [ "$CFG_OPENSSL" != "no" ]; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	306 - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/openssl "OpenSSL" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	307 + if [ "$XPLATFORM" = "win32-g++" ]; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	308 + echo "We cannot test for system CFG_OPENSSL since we are cross building for win32-g++, so we assume it is there."
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	309 + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/openssl "OpenSSL" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	310 if [ "$CFG_OPENSSL" = "auto" ]; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	311 CFG_OPENSSL=yes
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	312 fi
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	313 @@ -6087,6 +6162,7 @@
524 28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	314 [ "$CFG_3DNOW" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG 3dnow"
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	315 [ "$CFG_SSE" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG sse"
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	316 [ "$CFG_SSE2" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG sse2"
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	317 +[ "$CFG_RTTI" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG rtti"
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	318 [ "$CFG_IWMMXT" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG iwmmxt"
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	319 [ "$PLATFORM_MAC" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG $CFG_MAC_ARCHS"
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	320 if [ "$CFG_IPV6" = "yes" ]; then
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	321 @@ -6167,11 +6243,12 @@
491 1503cb754dde disable a disturbing build mechanism which is unnecessary when cross compiling in package qt Volker Grabsch <vog@notjusthosting.com> parents: 482 diff changeset	322 QT_CONFIG="$QT_CONFIG freetype"
1503cb754dde disable a disturbing build mechanism which is unnecessary when cross compiling in package qt Volker Grabsch <vog@notjusthosting.com> parents: 482 diff changeset	323 fi
1503cb754dde disable a disturbing build mechanism which is unnecessary when cross compiling in package qt Volker Grabsch <vog@notjusthosting.com> parents: 482 diff changeset	324
1503cb754dde disable a disturbing build mechanism which is unnecessary when cross compiling in package qt Volker Grabsch <vog@notjusthosting.com> parents: 482 diff changeset	325 -if [ "x$PLATFORM_MAC" = "xyes" ]; then
1503cb754dde disable a disturbing build mechanism which is unnecessary when cross compiling in package qt Volker Grabsch <vog@notjusthosting.com> parents: 482 diff changeset	326 - #On Mac we implicitly link against libz, so we
1503cb754dde disable a disturbing build mechanism which is unnecessary when cross compiling in package qt Volker Grabsch <vog@notjusthosting.com> parents: 482 diff changeset	327 - #never use the 3rdparty stuff.
1503cb754dde disable a disturbing build mechanism which is unnecessary when cross compiling in package qt Volker Grabsch <vog@notjusthosting.com> parents: 482 diff changeset	328 - [ "$CFG_ZLIB" = "yes" ] && CFG_ZLIB="system"
1503cb754dde disable a disturbing build mechanism which is unnecessary when cross compiling in package qt Volker Grabsch <vog@notjusthosting.com> parents: 482 diff changeset	329 -fi
1503cb754dde disable a disturbing build mechanism which is unnecessary when cross compiling in package qt Volker Grabsch <vog@notjusthosting.com> parents: 482 diff changeset	330 +# We're cross compiling, so we respect the user setting.
1503cb754dde disable a disturbing build mechanism which is unnecessary when cross compiling in package qt Volker Grabsch <vog@notjusthosting.com> parents: 482 diff changeset	331 +#if [ "x$PLATFORM_MAC" = "xyes" ]; then
1503cb754dde disable a disturbing build mechanism which is unnecessary when cross compiling in package qt Volker Grabsch <vog@notjusthosting.com> parents: 482 diff changeset	332 +# #On Mac we implicitly link against libz, so we
1503cb754dde disable a disturbing build mechanism which is unnecessary when cross compiling in package qt Volker Grabsch <vog@notjusthosting.com> parents: 482 diff changeset	333 +# #never use the 3rdparty stuff.
1503cb754dde disable a disturbing build mechanism which is unnecessary when cross compiling in package qt Volker Grabsch <vog@notjusthosting.com> parents: 482 diff changeset	334 +# [ "$CFG_ZLIB" = "yes" ] && CFG_ZLIB="system"
1503cb754dde disable a disturbing build mechanism which is unnecessary when cross compiling in package qt Volker Grabsch <vog@notjusthosting.com> parents: 482 diff changeset	335 +#fi
1503cb754dde disable a disturbing build mechanism which is unnecessary when cross compiling in package qt Volker Grabsch <vog@notjusthosting.com> parents: 482 diff changeset	336 if [ "$CFG_ZLIB" = "yes" ]; then
1503cb754dde disable a disturbing build mechanism which is unnecessary when cross compiling in package qt Volker Grabsch <vog@notjusthosting.com> parents: 482 diff changeset	337 QT_CONFIG="$QT_CONFIG zlib"
1503cb754dde disable a disturbing build mechanism which is unnecessary when cross compiling in package qt Volker Grabsch <vog@notjusthosting.com> parents: 482 diff changeset	338 elif [ "$CFG_ZLIB" = "system" ]; then
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	339 @@ -7102,7 +7179,7 @@
524 28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	340
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	341 cat >>"$QTCONFIG.tmp" <<EOF
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	342 #configuration
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	343 -CONFIG += $QTCONFIG_CONFIG
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	344 +CONFIG += $QMAKE_CONFIG $QTCONFIG_CONFIG
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	345 QT_ARCH = $CFG_ARCH
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	346 QT_EDITION = $Edition
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	347 QT_CONFIG += $QT_CONFIG
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	348 @@ -7194,7 +7271,7 @@
548 08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	349 if [ '!' -z "$OPENSSL_LIBS" ]; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	350 echo "OPENSSL_LIBS = $OPENSSL_LIBS" >> "$CACHEFILE.tmp"
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	351 elif [ "$CFG_OPENSSL" = "linked" ]; then
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	352 - echo "OPENSSL_LIBS = -lssl -lcrypto" >> "$CACHEFILE.tmp"
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	353 + echo "OPENSSL_LIBS = `$PKG_CONFIG --libs openssl`" >> "$CACHEFILE.tmp"
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	354 fi
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	355
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	356 #dump in the SDK info
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	357 @@ -7375,7 +7452,7 @@
564 c67df741dfa7 update version of package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 548 diff changeset	358 echo "Declarative module .. $CFG_DECLARATIVE"
524 28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	359 echo "STL support ......... $CFG_STL"
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	360 echo "PCH support ......... $CFG_PRECOMPILE"
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	361 -echo "MMX/3DNOW/SSE/SSE2.. ${CFG_MMX}/${CFG_3DNOW}/${CFG_SSE}/${CFG_SSE2}"
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	362 +echo "MMX/3DNOW/SSE/SSE2/RTTI.. ${CFG_MMX}/${CFG_3DNOW}/${CFG_SSE}/${CFG_SSE2}/${CFG_RTTI}"
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	363 if [ "${CFG_ARCH}" = "arm" ]; then
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	364 echo "iWMMXt support ...... ${CFG_IWMMXT}"
28e14850b092 improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 520 diff changeset	365 fi
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	366 @@ -7688,7 +7765,11 @@
452 ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	367 [ "$IN_ROOT" = "no" ] && continue
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	368
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	369 case $a in
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	370 - *winmain/winmain.pro) continue ;;
482 d2e34271758b cleanup in the win32 patch of package qt Volker Grabsch <vog@notjusthosting.com> parents: 479 diff changeset	371 + *winmain/winmain.pro)
d2e34271758b cleanup in the win32 patch of package qt Volker Grabsch <vog@notjusthosting.com> parents: 479 diff changeset	372 + case "$XPLATFORM" in
d2e34271758b cleanup in the win32 patch of package qt Volker Grabsch <vog@notjusthosting.com> parents: 479 diff changeset	373 + win32*) SPEC=$XQMAKESPEC ;;
d2e34271758b cleanup in the win32 patch of package qt Volker Grabsch <vog@notjusthosting.com> parents: 479 diff changeset	374 + *) continue ;;
d2e34271758b cleanup in the win32 patch of package qt Volker Grabsch <vog@notjusthosting.com> parents: 479 diff changeset	375 + esac ;;
452 ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	376 *s60main/s60main.pro) continue ;;
564 c67df741dfa7 update version of package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 548 diff changeset	377 examples/activeqt/) continue ;;
452 ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	378 */qmake/qmake.pro) continue ;;
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	379 diff -urN a/demos/spreadsheet/spreadsheet.pro b/demos/spreadsheet/spreadsheet.pro
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	380 --- a/demos/spreadsheet/spreadsheet.pro 2009-11-27 02:27:41.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	381 +++ b/demos/spreadsheet/spreadsheet.pro 2009-12-04 10:30:44.000000000 +0100
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	382 @@ -8,7 +8,7 @@
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	383 INCLUDEPATH += .
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	384
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	385 CONFIG += qt warn_on
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	386 -#unix:contains(QT_CONFIG, dbus):QT += dbus
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	387 +#unix:!win32:contains(QT_CONFIG, dbus):QT += dbus
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	388
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	389 # Input
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	390 HEADERS += printview.h spreadsheet.h spreadsheetdelegate.h spreadsheetitem.h
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	391 diff -urN a/doc/src/snippets/qmake/scopes.pro b/doc/src/snippets/qmake/scopes.pro
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	392 --- a/doc/src/snippets/qmake/scopes.pro 2009-11-27 02:27:44.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	393 +++ b/doc/src/snippets/qmake/scopes.pro 2009-12-04 10:30:44.000000000 +0100
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	394 @@ -17,7 +17,7 @@
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	395 }
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	396 #! [1]
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	397
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	398 -unix {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	399 +unix:!win32 {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	400 SOURCES += paintwidget_unix.cpp
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	401 }
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	402
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	403 diff -urN a/doc/src/snippets/qmake/spaces.pro b/doc/src/snippets/qmake/spaces.pro
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	404 --- a/doc/src/snippets/qmake/spaces.pro 2009-11-27 02:27:44.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	405 +++ b/doc/src/snippets/qmake/spaces.pro 2009-12-04 10:30:44.000000000 +0100
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	406 @@ -1,9 +1,9 @@
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	407 #! [quoting library paths with spaces]
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	408 win32:LIBS += $$quote(C:/mylibs/extra libs/extra.lib)
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	409 -unix:LIBS += $$quote(-L/home/user/extra libs) -lextra
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	410 +unix:!win32:LIBS += $$quote(-L/home/user/extra libs) -lextra
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	411 #! [quoting library paths with spaces]
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	412
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	413 #! [quoting include paths with spaces]
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	414 win32:INCLUDEPATH += $$quote(C:/mylibs/extra headers)
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	415 -unix:INCLUDEPATH += $$quote(/home/user/extra headers)
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	416 +unix:!win32:INCLUDEPATH += $$quote(/home/user/extra headers)
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	417 #! [quoting include paths with spaces]
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	418 diff -urN a/examples/itemviews/chart/chart.pro b/examples/itemviews/chart/chart.pro
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	419 --- a/examples/itemviews/chart/chart.pro 2009-11-27 02:27:48.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	420 +++ b/examples/itemviews/chart/chart.pro 2009-12-04 10:30:44.000000000 +0100
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	421 @@ -4,7 +4,7 @@
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	422 SOURCES = main.cpp \
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	423 mainwindow.cpp \
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	424 pieview.cpp
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	425 -unix:!mac:!symbian:!vxworks:LIBS+= -lm
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	426 +unix:!win32:!mac:!symbian:!vxworks:LIBS+= -lm
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	427
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	428 TARGET.EPOCHEAPSIZE = 0x200000 0x800000
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	429
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	430 diff -urN a/examples/painting/painterpaths/painterpaths.pro b/examples/painting/painterpaths/painterpaths.pro
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	431 --- a/examples/painting/painterpaths/painterpaths.pro 2009-11-27 02:27:48.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	432 +++ b/examples/painting/painterpaths/painterpaths.pro 2009-12-04 10:30:44.000000000 +0100
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	433 @@ -3,7 +3,7 @@
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	434 SOURCES = main.cpp \
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	435 renderarea.cpp \
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	436 window.cpp
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	437 -unix:!mac:!symbian:!vxworks:LIBS += -lm
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	438 +unix:!win32:!mac:!symbian:!vxworks:LIBS += -lm
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	439
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	440 # install
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	441 target.path = $$[QT_INSTALL_EXAMPLES]/painting/painterpaths
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	442 diff -urN a/examples/threads/mandelbrot/mandelbrot.pro b/examples/threads/mandelbrot/mandelbrot.pro
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	443 --- a/examples/threads/mandelbrot/mandelbrot.pro 2009-11-27 02:27:48.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	444 +++ b/examples/threads/mandelbrot/mandelbrot.pro 2009-12-04 10:30:44.000000000 +0100
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	445 @@ -4,7 +4,7 @@
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	446 mandelbrotwidget.cpp \
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	447 renderthread.cpp
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	448
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	449 -unix:!mac:!symbian:!vxworks:LIBS += -lm
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	450 +unix:!win32:!mac:!symbian:!vxworks:LIBS += -lm
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	451
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	452 # install
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	453 target.path = $$[QT_INSTALL_EXAMPLES]/threads/mandelbrot
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	454 diff -urN a/lib/qjpeg.prl b/lib/qjpeg.prl
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	455 --- a/lib/qjpeg.prl 1970-01-01 01:00:00.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	456 +++ b/lib/qjpeg.prl 2009-12-04 10:30:44.000000000 +0100
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	457 @@ -0,0 +1 @@
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	458 +QMAKE_PRL_LIBS = -ljpeg
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	459 diff -urN a/lib/qmng.prl b/lib/qmng.prl
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	460 --- a/lib/qmng.prl 1970-01-01 01:00:00.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	461 +++ b/lib/qmng.prl 2009-12-04 10:30:44.000000000 +0100
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	462 @@ -0,0 +1 @@
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	463 +QMAKE_PRL_LIBS = -lmng
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	464 diff -urN a/lib/qsqlite.prl b/lib/qsqlite.prl
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	465 --- a/lib/qsqlite.prl 1970-01-01 01:00:00.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	466 +++ b/lib/qsqlite.prl 2009-12-04 10:30:44.000000000 +0100
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	467 @@ -0,0 +1 @@
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	468 +QMAKE_PRL_LIBS = -lsqlite3
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	469 diff -urN a/lib/qsqlodbc.prl b/lib/qsqlodbc.prl
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	470 --- a/lib/qsqlodbc.prl 1970-01-01 01:00:00.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	471 +++ b/lib/qsqlodbc.prl 2009-12-04 10:30:44.000000000 +0100
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	472 @@ -0,0 +1 @@
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	473 +QMAKE_PRL_LIBS = -lodbc32
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	474 diff -urN a/lib/qsqlpsql.prl b/lib/qsqlpsql.prl
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	475 --- a/lib/qsqlpsql.prl 1970-01-01 01:00:00.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	476 +++ b/lib/qsqlpsql.prl 2009-12-04 10:30:44.000000000 +0100
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	477 @@ -0,0 +1 @@
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	478 +QMAKE_PRL_LIBS = -lpq
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	479 diff -urN a/lib/qsqltds.prl b/lib/qsqltds.prl
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	480 --- a/lib/qsqltds.prl 1970-01-01 01:00:00.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	481 +++ b/lib/qsqltds.prl 2009-12-04 10:30:44.000000000 +0100
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	482 @@ -0,0 +1 @@
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	483 +QMAKE_PRL_LIBS = -lsybdb -liconv
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	484 diff -urN a/lib/qtiff.prl b/lib/qtiff.prl
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	485 --- a/lib/qtiff.prl 1970-01-01 01:00:00.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	486 +++ b/lib/qtiff.prl 2009-12-04 10:30:44.000000000 +0100
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	487 @@ -0,0 +1 @@
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	488 +QMAKE_PRL_LIBS = -ltiff
564 c67df741dfa7 update version of package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 548 diff changeset	489 diff -urN a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	490 --- a/mkspecs/win32-g++/qmake.conf 2009-11-27 02:27:45.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	491 +++ b/mkspecs/win32-g++/qmake.conf 2009-12-04 10:30:44.000000000 +0100
548 08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	492 @@ -3,23 +3,31 @@
452 ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	493 #
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	494 # Written for MinGW
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	495 #
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	496 +load(qt_config)
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	497
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	498 MAKEFILE_GENERATOR = MINGW
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	499 TEMPLATE = app
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	500 CONFIG += qt warn_on release link_prl copy_dir_files debug_and_release debug_and_release_target precompile_header
467 dfd0873965ff in the qt-win32 patch, don't override the effect of a potential configure option "-no-exception" Volker Grabsch <vog@notjusthosting.com> parents: 464 diff changeset	501 +CONFIG += windows win32
452 ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	502 +CONFIG -= freetype
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	503 +QT_CONFIG -= freetype
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	504 QT += core gui
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	505 DEFINES += UNICODE QT_LARGEFILE_SUPPORT
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	506 +DEFINES -= QT_LARGEFILE_SUPPORT
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	507 +DEFINES += QT_TABLET QT_SESSIONMANAGER QT_NO_DIRECT3D QT_NO_CODECS
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	508 QMAKE_COMPILER_DEFINES += __GNUC__ WIN32
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	509
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	510 QMAKE_EXT_OBJ = .o
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	511 QMAKE_EXT_RES = _res.o
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	512
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	513 -QMAKE_CC = gcc
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	514 +QMAKE_CC = HOSTPLATFORMPREFIX-gcc
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	515 QMAKE_LEX = flex
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	516 QMAKE_LEXFLAGS =
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	517 QMAKE_YACC = byacc
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	518 QMAKE_YACCFLAGS = -d
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	519 QMAKE_CFLAGS =
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	520 +QMAKE_CFLAGS += -isystem HOSTPLATFORMINCLUDE
548 08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	521 +QMAKE_CFLAGS += -pipe
452 ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	522 QMAKE_CFLAGS_DEPS = -M
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	523 QMAKE_CFLAGS_WARN_ON = -Wall
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	524 QMAKE_CFLAGS_WARN_OFF = -w
548 08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	525 @@ -27,7 +35,7 @@
452 ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	526 QMAKE_CFLAGS_DEBUG = -g
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	527 QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	528
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	529 -QMAKE_CXX = g++
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	530 +QMAKE_CXX = HOSTPLATFORMPREFIX-g++
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	531 QMAKE_CXXFLAGS = $$QMAKE_CFLAGS
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	532 QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	533 QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
548 08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	534 @@ -42,6 +50,7 @@
452 ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	535 QMAKE_CXXFLAGS_EXCEPTIONS_OFF = -fno-exceptions
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	536
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	537 QMAKE_INCDIR =
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	538 +QMAKE_INCDIR += .
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	539 QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS]
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	540 QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS]
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	541
548 08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	542 @@ -50,8 +59,8 @@
452 ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	543 QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	544 QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	545
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	546 -QMAKE_LINK = g++
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	547 -QMAKE_LINK_C = gcc
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	548 +QMAKE_LINK = HOSTPLATFORMPREFIX-g++
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	549 +QMAKE_LINK_C = HOSTPLATFORMPREFIX-gcc
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	550 QMAKE_LFLAGS = -enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	551 QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads -Wl
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	552 QMAKE_LFLAGS_EXCEPTIONS_OFF =
548 08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	553 @@ -72,15 +81,18 @@
452 ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	554 QMAKE_LIBS_COMPAT = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	555 QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	556
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	557 +QMAKE_SH = bash
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	558 +
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	559 !isEmpty(QMAKE_SH) {
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	560 MINGW_IN_SHELL = 1
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	561 QMAKE_DIR_SEP = /
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	562 QMAKE_COPY = cp
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	563 - QMAKE_COPY_DIR = xcopy /s /q /y /i
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	564 + QMAKE_COPY_DIR = cp -r
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	565 QMAKE_MOVE = mv
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	566 QMAKE_DEL_FILE = rm
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	567 - QMAKE_MKDIR = mkdir
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	568 + QMAKE_MKDIR = mkdir -p
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	569 QMAKE_DEL_DIR = rmdir
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	570 + QMAKE_SYMBOLIC_LINK = ln -s
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	571 QMAKE_CHK_DIR_EXISTS = test -d
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	572 } else {
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	573 QMAKE_COPY = copy /y
548 08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	574 @@ -92,15 +104,16 @@
452 ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	575 QMAKE_CHK_DIR_EXISTS = if not exist
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	576 }
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	577
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	578 -QMAKE_MOC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}moc.exe
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	579 -QMAKE_UIC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}uic.exe
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	580 -QMAKE_IDC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}idc.exe
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	581 -
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	582 -QMAKE_IDL = midl
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	583 -QMAKE_LIB = ar -ru
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	584 -QMAKE_RC = windres
464 0174ea97b91d several bugfixes for package qt to ensure that "i686-pc-mingw32-qmake ; make" will work Volker Grabsch <vog@notjusthosting.com> parents: 452 diff changeset	585 +#QMAKE_IDC = HOSTPLATFORMPREFIX-idc
0174ea97b91d several bugfixes for package qt to ensure that "i686-pc-mingw32-qmake ; make" will work Volker Grabsch <vog@notjusthosting.com> parents: 452 diff changeset	586 +QMAKE_MOC = HOSTPLATFORMPREFIX-moc
0174ea97b91d several bugfixes for package qt to ensure that "i686-pc-mingw32-qmake ; make" will work Volker Grabsch <vog@notjusthosting.com> parents: 452 diff changeset	587 +QMAKE_RCC = HOSTPLATFORMPREFIX-rcc
0174ea97b91d several bugfixes for package qt to ensure that "i686-pc-mingw32-qmake ; make" will work Volker Grabsch <vog@notjusthosting.com> parents: 452 diff changeset	588 +QMAKE_UIC = HOSTPLATFORMPREFIX-uic
452 ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	589 +
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	590 +#QMAKE_IDL = midl
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	591 +QMAKE_LIB = HOSTPLATFORMPREFIX-ar -ru
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	592 +QMAKE_RC = HOSTPLATFORMPREFIX-windres
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	593 QMAKE_ZIP = zip -r -9
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	594
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	595 -QMAKE_STRIP = strip
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	596 +QMAKE_STRIP = HOSTPLATFORMPREFIX-strip
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	597 QMAKE_STRIPFLAGS_LIB += --strip-unneeded
ade2c475c772 new package: qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	598 -load(qt_config)
548 08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	599 +PKG_CONFIG = HOSTPLATFORMPREFIX-pkg-config
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	600 diff -urN a/projects.pro b/projects.pro
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	601 --- a/projects.pro 2009-11-27 02:27:45.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	602 +++ b/projects.pro 2009-12-04 10:30:44.000000000 +0100
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	603 @@ -55,7 +55,7 @@
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	604
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	605 !symbian: confclean.depends += clean
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	606 confclean.commands =
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	607 -unix:!symbian {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	608 +unix:!win32:!symbian {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	609 confclean.commands += (cd config.tests/unix/stl && $(MAKE) distclean); \
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	610 (cd config.tests/unix/endian && $(MAKE) distclean); \
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	611 (cd config.tests/unix/ipv6 && $(MAKE) distclean); \
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	612 diff -urN a/qmake/qmake.pri b/qmake/qmake.pri
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	613 --- a/qmake/qmake.pri 2009-11-27 02:27:48.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	614 +++ b/qmake/qmake.pri 2009-12-04 10:30:44.000000000 +0100
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	615 @@ -117,7 +117,7 @@
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	616 qxmlstream.h \
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	617 qxmlutils.h
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	618
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	619 - unix {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	620 + unix:!win32 {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	621 SOURCES += qfsfileengine_unix.cpp qfsfileengine_iterator_unix.cpp
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	622 mac {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	623 SOURCES += qcore_mac.cpp qsettings_mac.cpp
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	624 diff -urN a/src/3rdparty/javascriptcore/WebKit.pri b/src/3rdparty/javascriptcore/WebKit.pri
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	625 --- a/src/3rdparty/javascriptcore/WebKit.pri 2009-11-27 02:27:50.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	626 +++ b/src/3rdparty/javascriptcore/WebKit.pri 2009-12-04 10:30:44.000000000 +0100
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	627 @@ -31,7 +31,7 @@
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	628 DEPENDPATH += $$PWD/WebKit/qt/Api
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	629 }
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	630
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	631 -!mac:!unix\|symbian {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	632 +!mac:!unix\|win32\|symbian {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	633 DEFINES += USE_SYSTEM_MALLOC
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	634 }
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	635
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	636 diff -urN a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	637 --- a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro 2009-11-27 02:27:48.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	638 +++ b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro 2009-12-04 10:30:44.000000000 +0100
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	639 @@ -34,7 +34,7 @@
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	640
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	641 CONFIG(release):!CONFIG(QTDIR_build) {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	642 contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	643 - unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	644 + unix:!win32:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	645 }
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	646
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	647 linux-*: DEFINES += HAVE_STDINT_H
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	648 diff -urN a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	649 --- a/src/3rdparty/webkit/WebCore/WebCore.pro 2009-11-27 02:27:50.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	650 +++ b/src/3rdparty/webkit/WebCore/WebCore.pro 2009-12-04 15:14:47.000000000 +0100
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	651 @@ -45,17 +45,17 @@
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	652
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	653 GENERATED_SOURCES_DIR_SLASH = $$GENERATED_SOURCES_DIR${QMAKE_DIR_SEP}
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	654
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	655 -unix {
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	656 +unix:!win32 {
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	657 QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtNetwork
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	658 lessThan(QT_MINOR_VERSION, 4): QMAKE_PKGCONFIG_REQUIRES += QtXml
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	659 }
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	660
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	661 -unix:!mac:-g++:QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	662 -unix:!mac:-g++:QMAKE_LFLAGS += -Wl,--gc-sections
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	663 +unix:!win32:!mac:-g++:QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	664 +unix:!win32:!mac:-g++:QMAKE_LFLAGS += -Wl,--gc-sections
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	665
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	666 CONFIG(release):!CONFIG(QTDIR_build) {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	667 contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	668 - unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	669 + unix:!win32:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	670 }
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	671
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	672 linux-*: DEFINES += HAVE_STDINT_H
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	673 @@ -2442,6 +2442,11 @@
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	674 LIBS += -luser32
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	675 LIBS += -lwinmm
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	676 }
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	677 + #I thought qmake would take care of these
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	678 + win32-g++ {
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	679 + LIBS += -lpthread
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	680 + LIBS += -lws2_32
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	681 + }
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	682 wince*: LIBS += -lmmtimer
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	683
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	684 # Files belonging to the Qt 4.3 build
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	685 @@ -2477,7 +2482,7 @@
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	686
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	687 } else {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	688
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	689 - unix {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	690 + unix:!win32 {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	691
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	692 mac {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	693 SOURCES += \
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	694 @@ -2755,7 +2760,7 @@
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	695 xml/XPathVariableReference.cpp
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	696 }
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	697
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	698 -unix:!mac:CONFIG += link_pkgconfig
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	699 +unix:!win32:!mac:CONFIG += link_pkgconfig
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	700
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	701 contains(DEFINES, ENABLE_XSLT=1) {
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	702 FEATURE_DEFINES_JAVASCRIPT += ENABLE_XSLT=1
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	703 @@ -3324,7 +3329,7 @@
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	704
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	705 INSTALLS += target headers
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	706
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	707 - unix {
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	708 + unix:!win32 {
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	709 CONFIG += create_pc create_prl
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	710 QMAKE_PKGCONFIG_LIBDIR = $$target.path
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	711 QMAKE_PKGCONFIG_INCDIR = $$headers.path
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	712 diff -urN a/src/corelib/arch/generic/arch.pri b/src/corelib/arch/generic/arch.pri
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	713 --- a/src/corelib/arch/generic/arch.pri 2009-11-27 02:27:54.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	714 +++ b/src/corelib/arch/generic/arch.pri 2009-12-04 10:30:44.000000000 +0100
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	715 @@ -2,5 +2,5 @@
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	716 # 'generic' architecture
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	717 #
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	718
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	719 -unix:SOURCES += qatomic_generic_unix.cpp
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	720 +unix:!win32:SOURCES += qatomic_generic_unix.cpp
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	721 win32:SOURCES += qatomic_generic_windows.cpp
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	722 diff -urN a/src/corelib/codecs/codecs.pri b/src/corelib/codecs/codecs.pri
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	723 --- a/src/corelib/codecs/codecs.pri 2009-11-27 02:27:53.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	724 +++ b/src/corelib/codecs/codecs.pri 2009-12-04 10:30:44.000000000 +0100
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	725 @@ -19,7 +19,7 @@
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	726 codecs/qutfcodec.cpp \
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	727 codecs/qtextcodecplugin.cpp
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	728
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	729 -unix {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	730 +unix:!win32 {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	731 SOURCES += codecs/qfontlaocodec.cpp
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	732
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	733 contains(QT_CONFIG,iconv) {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	734 diff -urN a/src/corelib/kernel/kernel.pri b/src/corelib/kernel/kernel.pri
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	735 --- a/src/corelib/kernel/kernel.pri 2009-11-27 02:27:54.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	736 +++ b/src/corelib/kernel/kernel.pri 2009-12-04 10:30:44.000000000 +0100
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	737 @@ -89,7 +89,7 @@
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	738 kernel/qcore_mac.cpp
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	739 }
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	740
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	741 -unix:!symbian {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	742 +unix:!win32:!symbian {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	743 SOURCES += \
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	744 kernel/qcore_unix.cpp \
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	745 kernel/qcrashhandler.cpp \
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	746 diff -urN a/src/corelib/plugin/plugin.pri b/src/corelib/plugin/plugin.pri
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	747 --- a/src/corelib/plugin/plugin.pri 2009-11-27 02:27:54.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	748 +++ b/src/corelib/plugin/plugin.pri 2009-12-04 10:30:44.000000000 +0100
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	749 @@ -19,7 +19,7 @@
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	750 SOURCES += plugin/qlibrary_win.cpp
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	751 }
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	752
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	753 -unix {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	754 +unix:!win32 {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	755 SOURCES += plugin/qlibrary_unix.cpp
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	756 }
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	757
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	758 diff -urN a/src/corelib/thread/thread.pri b/src/corelib/thread/thread.pri
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	759 --- a/src/corelib/thread/thread.pri 2009-11-27 02:27:54.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	760 +++ b/src/corelib/thread/thread.pri 2009-12-04 10:30:44.000000000 +0100
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	761 @@ -24,7 +24,7 @@
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	762 thread/qthread.cpp \
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	763 thread/qthreadstorage.cpp
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	764
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	765 -unix:SOURCES += thread/qmutex_unix.cpp \
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	766 +unix:!win32:SOURCES += thread/qmutex_unix.cpp \
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	767 thread/qthread_unix.cpp \
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	768 thread/qwaitcondition_unix.cpp
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	769
564 c67df741dfa7 update version of package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 548 diff changeset	770 diff -urN a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	771 --- a/src/corelib/tools/tools.pri 2009-11-27 02:27:54.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	772 +++ b/src/corelib/tools/tools.pri 2009-12-04 10:30:44.000000000 +0100
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	773 @@ -96,8 +96,8 @@
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	774 ../3rdparty/zlib/uncompr.c \
564 c67df741dfa7 update version of package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 548 diff changeset	775 ../3rdparty/zlib/zutil.c
c67df741dfa7 update version of package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 548 diff changeset	776 } else:!contains(QT_CONFIG, no-zlib) {
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	777 - unix:LIBS_PRIVATE += -lz
564 c67df741dfa7 update version of package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 548 diff changeset	778 -# win32:LIBS += libz.lib
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	779 + unix\|win32-g++:LIBS_PRIVATE += -lz
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	780 + win32-msvc*\|win32-icc:LIBS += zdll.lib
509 e97947e7d45e update version of package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 491 diff changeset	781 }
564 c67df741dfa7 update version of package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 548 diff changeset	782
c67df741dfa7 update version of package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 548 diff changeset	783 DEFINES += HB_EXPORT=Q_CORE_EXPORT
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	784 @@ -118,5 +118,5 @@
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	785 ../3rdparty/md4
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	786
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	787 # Note: libm should be present by default becaue this is C++
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	788 -!macx-icc:!vxworks:!symbian:unix:LIBS_PRIVATE += -lm
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	789 +!macx-icc:!vxworks:!symbian:!win32:unix:LIBS_PRIVATE += -lm
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	790
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	791 diff -urN a/src/gui/dialogs/dialogs.pri b/src/gui/dialogs/dialogs.pri
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	792 --- a/src/gui/dialogs/dialogs.pri 2009-11-27 02:27:52.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	793 +++ b/src/gui/dialogs/dialogs.pri 2009-12-04 10:30:44.000000000 +0100
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	794 @@ -46,7 +46,7 @@
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	795 !win32-borland:!wince*: LIBS += -lshell32 # the filedialog needs this library
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	796 }
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	797
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	798 -!mac:!embedded:!symbian:unix {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	799 +!mac:!embedded:!symbian:!win32:unix {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	800 HEADERS += dialogs/qpagesetupdialog_unix_p.h
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	801 SOURCES += dialogs/qprintdialog_unix.cpp \
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	802 dialogs/qpagesetupdialog_unix.cpp
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	803 diff -urN a/src/gui/egl/egl.pri b/src/gui/egl/egl.pri
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	804 --- a/src/gui/egl/egl.pri 2009-11-27 02:27:53.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	805 +++ b/src/gui/egl/egl.pri 2009-12-04 10:30:44.000000000 +0100
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	806 @@ -10,7 +10,7 @@
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	807
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	808 wince*: SOURCES += egl/qegl_wince.cpp
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	809
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	810 -unix {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	811 +unix:!win32 {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	812 embedded {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	813 SOURCES += egl/qegl_qws.cpp
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	814 } else {
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	815 diff -urN a/src/gui/gui.pro b/src/gui/gui.pro
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	816 --- a/src/gui/gui.pro 2009-11-27 02:27:53.000000000 +0100
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	817 +++ b/src/gui/gui.pro 2009-12-04 10:30:44.000000000 +0100
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	818 @@ -6,7 +6,7 @@
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	819
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	820 !win32:!embedded:!mac:!symbian:CONFIG += x11
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	821
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	822 -unix:QMAKE_PKGCONFIG_REQUIRES = QtCore
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	823 +unix:!win32:QMAKE_PKGCONFIG_REQUIRES = QtCore
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	824
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	825 include(../qbase.pri)
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	826
564 c67df741dfa7 update version of package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 548 diff changeset	827 diff -urN a/src/gui/image/image.pri b/src/gui/image/image.pri
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	828 --- a/src/gui/image/image.pri 2009-11-27 02:27:52.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	829 +++ b/src/gui/image/image.pri 2009-12-04 10:30:44.000000000 +0100
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	830 @@ -93,11 +93,11 @@
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	831 SOURCES += image/qpnghandler.cpp
509 e97947e7d45e update version of package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 491 diff changeset	832
564 c67df741dfa7 update version of package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 548 diff changeset	833 contains(QT_CONFIG, system-png) {
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	834 - unix:LIBS_PRIVATE += -lpng
564 c67df741dfa7 update version of package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 548 diff changeset	835 - win32:LIBS += libpng.lib
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	836 + unix\|win32-g++:LIBS_PRIVATE += -lpng
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	837 + win32-msvc*\|win32-icc:LIBS += libpng.lib
564 c67df741dfa7 update version of package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 548 diff changeset	838 } else {
c67df741dfa7 update version of package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 548 diff changeset	839 !isEqual(QT_ARCH, i386):!isEqual(QT_ARCH, x86_64):DEFINES += PNG_NO_ASSEMBLER_CODE
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	840 - INCLUDEPATH += ../3rdparty/libpng ../3rdparty/zlib
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	841 + INCLUDEPATH += ../3rdparty/libpng
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	842 SOURCES += ../3rdparty/libpng/png.c \
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	843 ../3rdparty/libpng/pngerror.c \
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	844 ../3rdparty/libpng/pngget.c \
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	845 @@ -114,6 +114,14 @@
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	846 ../3rdparty/libpng/pngwtran.c \
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	847 ../3rdparty/libpng/pngwutil.c \
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	848 ../3rdparty/libpng/pnggccrd.c
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	849 +
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	850 + contains(QT_CONFIG, system-zlib) {
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	851 + unix\|win32-g++:LIBS_PRIVATE += -lz
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	852 + win32-msvc*\|win32-icc:LIBS += zdll.lib
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	853 + } else {
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	854 + INCLUDEPATH += ../3rdparty/zlib
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	855 + }
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	856 +
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	857 }
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	858 } else {
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	859 DEFINES *= QT_NO_IMAGEFORMAT_PNG
564 c67df741dfa7 update version of package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 548 diff changeset	860 diff -urN a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	861 --- a/src/gui/painting/painting.pri 2009-11-27 02:27:53.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	862 +++ b/src/gui/painting/painting.pri 2009-12-04 10:30:44.000000000 +0100
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	863 @@ -153,7 +153,7 @@
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	864 painting/qprintengine_mac.mm \
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	865 }
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	866
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	867 -unix:!mac:!symbian {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	868 +unix:!win32:!mac:!symbian {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	869 HEADERS += \
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	870 painting/qprinterinfo_unix_p.h
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	871 SOURCES += \
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	872 @@ -380,9 +380,9 @@
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	873 }
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	874
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	875 contains(QT_CONFIG, zlib) {
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	876 - INCLUDEPATH += ../3rdparty/zlib
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	877 + INCLUDEPATH += ../3rdparty/zlib
564 c67df741dfa7 update version of package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 548 diff changeset	878 } else:!contains(QT_CONFIG, no-zlib) {
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	879 - unix:LIBS_PRIVATE += -lz
564 c67df741dfa7 update version of package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 548 diff changeset	880 -# win32:LIBS += libz.lib
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	881 + unix\|win32-g++:LIBS_PRIVATE += -lz
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	882 + win32-msvc*\|win32-icc:LIBS += zdll.lib
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	883 }
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	884
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	885 diff -urN a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	886 --- a/src/multimedia/multimedia.pro 2009-11-27 02:27:54.000000000 +0100
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	887 +++ b/src/multimedia/multimedia.pro 2009-12-04 10:30:44.000000000 +0100
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	888 @@ -4,7 +4,7 @@
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	889
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	890 DEFINES += QT_BUILD_MULTIMEDIA_LIB QT_NO_USING_NAMESPACE
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	891
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	892 -unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	893 +unix:!win32:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	894
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	895 include(../qbase.pri)
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	896
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	897 diff -urN a/src/network/access/access.pri b/src/network/access/access.pri
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	898 --- a/src/network/access/access.pri 2009-11-27 02:27:53.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	899 +++ b/src/network/access/access.pri 2009-12-04 10:30:44.000000000 +0100
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	900 @@ -57,8 +57,8 @@
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	901
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	902 #zlib support
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	903 contains(QT_CONFIG, zlib) {
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	904 - INCLUDEPATH += ../3rdparty/zlib
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	905 + INCLUDEPATH += ../3rdparty/zlib
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	906 } else:!contains(QT_CONFIG, no-zlib) {
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	907 - unix:LIBS_PRIVATE += -lz
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	908 -# win32:LIBS += libz.lib
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	909 + unix\|win32-g++:LIBS_PRIVATE += -lz
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	910 + win32-msvc*\|win32-icc:LIBS += zdll.lib
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	911 }
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	912 diff -urN a/src/network/kernel/kernel.pri b/src/network/kernel/kernel.pri
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	913 --- a/src/network/kernel/kernel.pri 2009-11-27 02:27:53.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	914 +++ b/src/network/kernel/kernel.pri 2009-12-04 10:30:44.000000000 +0100
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	915 @@ -21,7 +21,7 @@
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	916 kernel/qnetworkinterface.cpp
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	917
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	918 symbian: SOURCES += kernel/qhostinfo_unix.cpp kernel/qnetworkinterface_symbian.cpp
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	919 -unix:!symbian:SOURCES += kernel/qhostinfo_unix.cpp kernel/qnetworkinterface_unix.cpp
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	920 +unix:!win32:!symbian:SOURCES += kernel/qhostinfo_unix.cpp kernel/qnetworkinterface_unix.cpp
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	921 win32:SOURCES += kernel/qhostinfo_win.cpp kernel/qnetworkinterface_win.cpp
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	922
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	923 mac:LIBS_PRIVATE += -framework SystemConfiguration -framework CoreFoundation
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	924 diff -urN a/src/network/network.pro b/src/network/network.pro
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	925 --- a/src/network/network.pro 2009-11-27 02:27:53.000000000 +0100
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	926 +++ b/src/network/network.pro 2009-12-04 10:30:44.000000000 +0100
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	927 @@ -13,7 +13,7 @@
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	928 QT = core
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	929 win32-msvc*\|win32-icc:QMAKE_LFLAGS += /BASE:0x64000000
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	930
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	931 -unix:QMAKE_PKGCONFIG_REQUIRES = QtCore
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	932 +unix:!win32:QMAKE_PKGCONFIG_REQUIRES = QtCore
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	933
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	934 include(../qbase.pri)
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	935 include(access/access.pri)
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	936 diff -urN a/src/network/socket/socket.pri b/src/network/socket/socket.pri
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	937 --- a/src/network/socket/socket.pri 2009-11-27 02:27:53.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	938 +++ b/src/network/socket/socket.pri 2009-12-04 10:30:44.000000000 +0100
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	939 @@ -25,10 +25,10 @@
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	940 socket/qlocalsocket.cpp \
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	941 socket/qlocalserver.cpp
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	942
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	943 -unix:SOURCES += socket/qnativesocketengine_unix.cpp \
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	944 +unix:!win32:SOURCES += socket/qnativesocketengine_unix.cpp \
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	945 socket/qlocalsocket_unix.cpp \
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	946 socket/qlocalserver_unix.cpp
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	947 -unix:HEADERS += \
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	948 +unix:!win32:HEADERS += \
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	949 socket/qnet_unix_p.h
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	950
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	951 win32:SOURCES += socket/qnativesocketengine_win.cpp \
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	952 diff -urN a/src/opengl/opengl.pro b/src/opengl/opengl.pro
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	953 --- a/src/opengl/opengl.pro 2009-11-27 02:27:52.000000000 +0100
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	954 +++ b/src/opengl/opengl.pro 2009-12-04 12:32:50.000000000 +0100
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	955 @@ -6,7 +6,7 @@
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	956 win32-msvc*\|win32-icc:QMAKE_LFLAGS += /BASE:0x63000000
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	957 solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	958
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	959 -unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	960 +unix:!win32:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	961
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	962 include(../qbase.pri)
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	963
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	964 @@ -17,6 +17,9 @@
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	965 contains(QT_CONFIG, opengles2):CONFIG += opengles2
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	966 contains(QT_CONFIG, egl):CONFIG += egl
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	967
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	968 +#Thought qmake was supposed to do this.
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	969 +LIBS += $$QMAKE_LIBS_OPENGL
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	970 +
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	971 HEADERS += qgl.h \
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	972 qgl_p.h \
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	973 qglcolormap.h \
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	974 diff -urN a/src/openvg/openvg.pro b/src/openvg/openvg.pro
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	975 --- a/src/openvg/openvg.pro 2009-11-27 02:27:53.000000000 +0100
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	976 +++ b/src/openvg/openvg.pro 2009-12-04 10:30:44.000000000 +0100
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	977 @@ -33,7 +33,7 @@
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	978
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	979 include(../qbase.pri)
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	980
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	981 -unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	982 +unix:!win32:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	983
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	984 !isEmpty(QMAKE_INCDIR_OPENVG): INCLUDEPATH += $$QMAKE_INCDIR_OPENVG
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	985 !isEmpty(QMAKE_LIBDIR_OPENVG): LIBS_PRIVATE += -L$$QMAKE_LIBDIR_OPENVG
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	986 diff -urN a/src/phonon/phonon.pro b/src/phonon/phonon.pro
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	987 --- a/src/phonon/phonon.pro 2009-11-27 02:27:52.000000000 +0100
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	988 +++ b/src/phonon/phonon.pro 2009-12-04 10:30:44.000000000 +0100
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	989 @@ -11,7 +11,7 @@
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	990
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	991 PHONON_DIR = $$QT_SOURCE_TREE/src/3rdparty/phonon/phonon
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	992
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	993 -unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtNetwork
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	994 +unix:!win32:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtNetwork
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	995
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	996 # Input
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	997 HEADERS += $$PHONON_DIR/abstractaudiooutput.h \
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	998 @@ -107,7 +107,7 @@
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	999 QT += dbus
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1000 HEADERS += $$PHONON_DIR/audiooutputadaptor_p.h
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1001 SOURCES += $$PHONON_DIR/audiooutputadaptor.cpp
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1002 - unix:QMAKE_PKGCONFIG_REQUIRES += QtDBus
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1003 + unix:!win32:QMAKE_PKGCONFIG_REQUIRES += QtDBus
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1004 } else {
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1005 DEFINES += QT_NO_DBUS
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1006 }
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1007 diff -urN a/src/plugins/codecs/jp/jp.pro b/src/plugins/codecs/jp/jp.pro
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1008 --- a/src/plugins/codecs/jp/jp.pro 2009-11-27 02:27:53.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1009 +++ b/src/plugins/codecs/jp/jp.pro 2009-12-04 10:30:44.000000000 +0100
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1010 @@ -16,7 +16,7 @@
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1011 qjpunicode.cpp \
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1012 main.cpp
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1013
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1014 -unix {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1015 +unix:!win32 {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1016 HEADERS += qfontjpcodec.h
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1017 SOURCES += qfontjpcodec.cpp
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1018 }
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1019 diff -urN a/src/plugins/imageformats/jpeg/jpeg.pro b/src/plugins/imageformats/jpeg/jpeg.pro
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1020 --- a/src/plugins/imageformats/jpeg/jpeg.pro 2009-11-27 02:27:53.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1021 +++ b/src/plugins/imageformats/jpeg/jpeg.pro 2009-12-04 10:30:44.000000000 +0100
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1022 @@ -20,8 +20,8 @@
564 c67df741dfa7 update version of package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 548 diff changeset	1023 }
509 e97947e7d45e update version of package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 491 diff changeset	1024
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1025 contains(QT_CONFIG, system-jpeg) {
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1026 - unix:LIBS += -ljpeg
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1027 - win32:LIBS += libjpeg.lib
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1028 + unix\|win32-g++:LIBS += -ljpeg
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1029 + win32-msvc*\|win32-icc:LIBS += libjpeg.lib
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1030 }
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1031 !contains(QT_CONFIG, system-jpeg) {
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1032 INCLUDEPATH += ../../../3rdparty/libjpeg
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1033 diff -urN a/src/plugins/imageformats/mng/mng.pro b/src/plugins/imageformats/mng/mng.pro
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1034 --- a/src/plugins/imageformats/mng/mng.pro 2009-11-27 02:27:53.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1035 +++ b/src/plugins/imageformats/mng/mng.pro 2009-12-04 13:53:53.000000000 +0100
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1036 @@ -14,10 +14,9 @@
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1037 }
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1038
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1039 contains(QT_CONFIG, system-mng) {
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1040 - unix:LIBS += -lmng
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1041 - win32:LIBS += libmng.lib
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1042 -}
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1043 -!contains(QT_CONFIG, system-mng) {
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1044 + unix\|win32-g++:LIBS += -lmng
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1045 + win32-msvc*\|win32-icc:LIBS += libmng.lib
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1046 +} else {
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1047 DEFINES += MNG_BUILD_SO
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1048 DEFINES += MNG_NO_INCLUDE_JNG
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1049 INCLUDEPATH += ../../../3rdparty/libmng
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1050 @@ -43,11 +42,16 @@
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1051 ../../../3rdparty/libmng/libmng_zlib.c
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1052 }
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1053
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1054 -contains(QT_CONFIG, system-zlib) {
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1055 - LIBS += -lz
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1056 +contains(QT_CONFIG, system-jpeg) {
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1057 + unix\|win32-g++:LIBS_PRIVATE += -ljpeg
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1058 + win32-msvc*\|win32-icc:LIBS += libjpeg.lib
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1059 }
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1060 -!contains(QT_CONFIG, system-zlib) {
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1061 - INCLUDEPATH += ../../../3rdparty/zlib
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1062 +
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1063 +contains(QT_CONFIG, system-zlib) {
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1064 + unix\|win32-g++:LIBS_PRIVATE += -lz
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1065 + win32-msvc*\|win32-icc:LIBS += zdll.lib
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1066 +} else {
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1067 + INCLUDEPATH += ../../../3rdparty/zlib
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1068 }
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1069
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1070 QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/imageformats
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1071 diff -urN a/src/plugins/imageformats/tiff/tiff.pro b/src/plugins/imageformats/tiff/tiff.pro
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1072 --- a/src/plugins/imageformats/tiff/tiff.pro 2009-11-27 02:27:53.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1073 +++ b/src/plugins/imageformats/tiff/tiff.pro 2009-12-04 15:23:34.000000000 +0100
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1074 @@ -8,10 +8,9 @@
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1075 qtiffhandler.cpp
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1076
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1077 contains(QT_CONFIG, system-tiff) {
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1078 - unix:LIBS += -ltiff
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1079 - win32:LIBS += libtiff.lib
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1080 -}
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1081 -!contains(QT_CONFIG, system-tiff) {
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1082 + unix\|win32-g++:LIBS += -ltiff
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1083 + win32-msvc*\|win32-icc:LIBS += libtiff.lib
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1084 +} else {
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1085 INCLUDEPATH += ../../../3rdparty/libtiff/libtiff
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1086 SOURCES += \
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1087 ../../../3rdparty/libtiff/libtiff/tif_aux.c \
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1088 @@ -50,7 +49,7 @@
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1089 win32 {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1090 SOURCES += ../../../3rdparty/libtiff/libtiff/tif_win32.c
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1091 }
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1092 - unix: {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1093 + unix:!win32: {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1094 SOURCES += ../../../3rdparty/libtiff/libtiff/tif_unix.c
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1095 }
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1096 wince*: {
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1097 @@ -61,11 +60,18 @@
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1098 }
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1099 }
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1101 -contains(QT_CONFIG, system-zlib) {
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1102 - LIBS += -lz
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1103 +contains(QT_CONFIG, system-jpeg) {
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1104 + unix\|win32-g++:LIBS_PRIVATE += -ljpeg
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1105 + win32-msvc*\|win32-icc:LIBS += libjpeg.lib
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1106 +} else {
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1107 + INCLUDEPATH += ../../../3rdparty/zlib
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1108 }
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1109 -!contains(QT_CONFIG, system-zlib) {
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1110 - INCLUDEPATH += ../../../3rdparty/zlib
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1111 +
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1112 +contains(QT_CONFIG, system-zlib) {
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1113 + unix\|win32-g++:LIBS_PRIVATE += -lz
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1114 + win32-msvc*\|win32-icc:LIBS += zdll.lib
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1115 +} else {
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1116 + INCLUDEPATH += ../../../3rdparty/zlib
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1117 }
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1118
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1119 QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/imageformats
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1120 diff -urN a/src/plugins/phonon/phonon.pro b/src/plugins/phonon/phonon.pro
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1121 --- a/src/plugins/phonon/phonon.pro 2009-11-27 02:27:53.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1122 +++ b/src/plugins/phonon/phonon.pro 2009-12-04 10:30:44.000000000 +0100
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1123 @@ -2,7 +2,7 @@
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1124
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1125 SUBDIRS =
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1126
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1127 -unix:contains(QT_CONFIG, gstreamer): SUBDIRS *= gstreamer
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1128 +unix:!win32:contains(QT_CONFIG, gstreamer): SUBDIRS *= gstreamer
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1129 mac:contains(QT_CONFIG, phonon-backend): SUBDIRS *= qt7
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1130 win32:!wince:contains(QT_CONFIG, phonon-backend): SUBDIRS = ds9
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1131 wince:contains(QT_CONFIG, phonon-backend): SUBDIRS = waveout
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1132 diff -urN a/src/plugins/plugins.pro b/src/plugins/plugins.pro
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1133 --- a/src/plugins/plugins.pro 2009-11-27 02:27:53.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1134 +++ b/src/plugins/plugins.pro 2009-12-04 10:30:44.000000000 +0100
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1135 @@ -1,7 +1,7 @@
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1136 TEMPLATE = subdirs
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1137
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1138 SUBDIRS *= accessible imageformats sqldrivers iconengines script
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1139 -unix:!symbian {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1140 +unix:!win32:!symbian {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1141 contains(QT_CONFIG,iconv)\|contains(QT_CONFIG,gnu-libiconv):SUBDIRS *= codecs
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1142 } else {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1143 SUBDIRS *= codecs
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1144 diff -urN a/src/plugins/sqldrivers/db2/db2.pro b/src/plugins/sqldrivers/db2/db2.pro
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1145 --- a/src/plugins/sqldrivers/db2/db2.pro 2009-11-27 02:27:53.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1146 +++ b/src/plugins/sqldrivers/db2/db2.pro 2009-12-04 10:30:44.000000000 +0100
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1147 @@ -4,7 +4,7 @@
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1148 SOURCES = main.cpp \
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1149 ../../../sql/drivers/db2/qsql_db2.cpp
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1150
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1151 -unix:!contains( LIBS, .db2. ):LIBS *= -ldb2
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1152 +unix:!win32:!contains( LIBS, .db2. ):LIBS *= -ldb2
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1153 win32:!contains( LIBS, .db2. ):LIBS *= -ldb2cli
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1154
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1155 include(../qsqldriverbase.pri)
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1156 diff -urN a/src/plugins/sqldrivers/ibase/ibase.pro b/src/plugins/sqldrivers/ibase/ibase.pro
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1157 --- a/src/plugins/sqldrivers/ibase/ibase.pro 2009-11-27 02:27:53.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1158 +++ b/src/plugins/sqldrivers/ibase/ibase.pro 2009-12-04 10:30:44.000000000 +0100
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1159 @@ -4,9 +4,9 @@
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1160 SOURCES = main.cpp \
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1161 ../../../sql/drivers/ibase/qsql_ibase.cpp
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1162
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1163 -unix:!contains( LIBS, .gds. ):!contains( LIBS, .libfb. ):LIBS *= -lgds
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1164 +unix:!win32:!contains( LIBS, .gds. ):!contains( LIBS, .libfb. ):LIBS *= -lgds
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1165
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1166 -win32:!contains( LIBS, .gds. ):!contains( LIBS, .fbclient. ) {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1167 +!unix:win32:!contains( LIBS, .gds. ):!contains( LIBS, .fbclient. ) {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1168 !win32-borland:LIBS *= -lgds32_ms
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1169 win32-borland:LIBS += gds32.lib
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1170 }
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1171 diff -urN a/src/plugins/sqldrivers/mysql/mysql.pro b/src/plugins/sqldrivers/mysql/mysql.pro
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1172 --- a/src/plugins/sqldrivers/mysql/mysql.pro 2009-11-27 02:27:53.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1173 +++ b/src/plugins/sqldrivers/mysql/mysql.pro 2009-12-04 10:30:44.000000000 +0100
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1174 @@ -4,7 +4,7 @@
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1175 SOURCES = main.cpp \
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1176 ../../../sql/drivers/mysql/qsql_mysql.cpp
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1177
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1178 -unix: {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1179 +unix:!win32: {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1180 isEmpty(QT_LFLAGS_MYSQL) {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1181 !contains(LIBS, .mysqlclient.):!contains(LIBS, .mysqld.) {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1182 use_libmysqlclient_r:LIBS *= -lmysqlclient_r
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1183 diff -urN a/src/plugins/sqldrivers/oci/oci.pro b/src/plugins/sqldrivers/oci/oci.pro
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1184 --- a/src/plugins/sqldrivers/oci/oci.pro 2009-11-27 02:27:53.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1185 +++ b/src/plugins/sqldrivers/oci/oci.pro 2009-12-04 10:30:44.000000000 +0100
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1186 @@ -6,7 +6,7 @@
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1187
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1188 win32:LIBS *= -loci
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1189
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1190 -unix:!contains( LIBS, .clnts. ):LIBS *= -lclntsh
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1191 +unix:!win32:!contains( LIBS, .clnts. ):LIBS *= -lclntsh
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1192
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1193 macx:QMAKE_LFLAGS += -Wl,-flat_namespace,-U,_environ
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1194
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1195 diff -urN a/src/plugins/sqldrivers/odbc/odbc.pro b/src/plugins/sqldrivers/odbc/odbc.pro
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1196 --- a/src/plugins/sqldrivers/odbc/odbc.pro 2009-11-27 02:27:53.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1197 +++ b/src/plugins/sqldrivers/odbc/odbc.pro 2009-12-04 10:30:44.000000000 +0100
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1198 @@ -4,7 +4,7 @@
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1199 SOURCES = main.cpp \
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1200 ../../../sql/drivers/odbc/qsql_odbc.cpp
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1201
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1202 -unix {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1203 +unix:!win32 {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1204 !contains( LIBS, .odbc. ) {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1205 LIBS *= $$QT_LFLAGS_ODBC
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1206 }
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1207 diff -urN a/src/plugins/sqldrivers/psql/psql.pro b/src/plugins/sqldrivers/psql/psql.pro
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1208 --- a/src/plugins/sqldrivers/psql/psql.pro 2009-11-27 02:27:53.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1209 +++ b/src/plugins/sqldrivers/psql/psql.pro 2009-12-04 10:30:44.000000000 +0100
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1210 @@ -4,7 +4,7 @@
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1211 SOURCES = main.cpp \
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1212 ../../../sql/drivers/psql/qsql_psql.cpp
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1213
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1214 -unix: {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1215 +unix:!win32: {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1216 !isEmpty(QT_LFLAGS_PSQL) {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1217 LIBS *= $$QT_LFLAGS_PSQL
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1218 QMAKE_CXXFLAGS *= $$QT_CFLAGS_PSQL
564 c67df741dfa7 update version of package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 548 diff changeset	1219 diff -urN a/src/plugins/sqldrivers/tds/main.cpp b/src/plugins/sqldrivers/tds/main.cpp
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1220 --- a/src/plugins/sqldrivers/tds/main.cpp 2009-11-27 02:27:53.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1221 +++ b/src/plugins/sqldrivers/tds/main.cpp 2009-12-04 10:30:44.000000000 +0100
548 08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	1222 @@ -47,6 +47,7 @@
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	1223 #define _WINSCARD_H_
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	1224 #include <windows.h>
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	1225 #endif
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	1226 +#define Q_USE_SYBASE
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	1227 #include "../../../sql/drivers/tds/qsql_tds.h"
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	1228
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	1229 QT_BEGIN_NAMESPACE
564 c67df741dfa7 update version of package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 548 diff changeset	1230 diff -urN a/src/plugins/sqldrivers/tds/tds.pro b/src/plugins/sqldrivers/tds/tds.pro
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1231 --- a/src/plugins/sqldrivers/tds/tds.pro 2009-11-27 02:27:53.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1232 +++ b/src/plugins/sqldrivers/tds/tds.pro 2009-12-04 10:30:44.000000000 +0100
548 08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	1233 @@ -5,11 +5,6 @@
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	1234 SOURCES = main.cpp \
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	1235 ../../../sql/drivers/tds/qsql_tds.cpp
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	1236
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	1237 -unix:!contains( LIBS, .sybdb. ):LIBS *= -lsybdb
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	1238 -
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	1239 -win32 {
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	1240 - !win32-borland:LIBS *= -lNTWDBLIB
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	1241 - win32-borland:LIBS *= $(BCB)/lib/PSDK/NTWDBLIB.LIB
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	1242 -}
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	1243 -
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	1244 +#Patched to use FreeTDS targetting MinGW
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	1245 +LIBS *= -lsybdb -liconv -lws2_32
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	1246 include(../qsqldriverbase.pri)
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1247 diff -urN a/src/qbase.pri b/src/qbase.pri
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1248 --- a/src/qbase.pri 2009-11-27 02:27:54.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1249 +++ b/src/qbase.pri 2009-12-04 10:30:44.000000000 +0100
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1250 @@ -39,7 +39,7 @@
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1251 linux-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1252
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1253 contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1254 -unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1255 +unix:!win32:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1256 contains(QT_CONFIG, largefile):CONFIG += largefile
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1257
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1258 #mac frameworks
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1259 @@ -85,7 +85,6 @@
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1260 }
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1261
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1262 win32 {
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1263 - CONFIG += zlib
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1264 INCLUDEPATH += tmp
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1265 !static: DEFINES+=QT_MAKEDLL
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1266 }
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1267 @@ -144,7 +143,7 @@
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1268 #install directives
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1269 include(qt_install.pri)
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1270
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1271 -unix:!symbian {
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1272 +unix:!win32:!symbian {
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1273 CONFIG += create_libtool create_pc explicitlib
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1274 QMAKE_LIBTOOL_LIBDIR = $$[QT_INSTALL_LIBS]
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1275 QMAKE_PRL_LIBDIR = $$[QT_INSTALL_LIBS]
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1276 diff -urN a/src/qt3support/network/network.pri b/src/qt3support/network/network.pri
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1277 --- a/src/qt3support/network/network.pri 2009-11-27 02:27:54.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1278 +++ b/src/qt3support/network/network.pri 2009-12-04 10:30:44.000000000 +0100
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1279 @@ -25,6 +25,6 @@
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1280 network/q3urloperator.cpp
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1281
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1282 win32:SOURCES += network/q3socketdevice_win.cpp
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1283 -unix:SOURCES += network/q3socketdevice_unix.cpp
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1284 +unix:!win32:SOURCES += network/q3socketdevice_unix.cpp
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1285 mac:LIBS_PRIVATE += -lresolv
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1286
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1287 diff -urN a/src/qt3support/other/other.pri b/src/qt3support/other/other.pri
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1288 --- a/src/qt3support/other/other.pri 2009-11-27 02:27:54.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1289 +++ b/src/qt3support/other/other.pri 2009-12-04 10:30:44.000000000 +0100
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1290 @@ -18,7 +18,7 @@
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1291 other/q3process.cpp \
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1292 other/q3membuf.cpp
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1293
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1294 -unix:SOURCES += other/q3process_unix.cpp
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1295 +unix:!win32:SOURCES += other/q3process_unix.cpp
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1296 win32:SOURCES+= other/q3process_win.cpp
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1297
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1298
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1299 diff -urN a/src/qt3support/qt3support.pro b/src/qt3support/qt3support.pro
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1300 --- a/src/qt3support/qt3support.pro 2009-11-27 02:27:54.000000000 +0100
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1301 +++ b/src/qt3support/qt3support.pro 2009-12-04 10:30:44.000000000 +0100
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1302 @@ -21,7 +21,7 @@
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1303 include(network/network.pri)
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1304 include(painting/painting.pri)
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1305
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1306 -unix {
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1307 +unix:!win32 {
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1308 QMAKE_PKGCONFIG_CFLAGS += -DQT3_SUPPORT
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1309 QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtNetwork QtSql
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1310 }
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1311 diff -urN a/src/script/script.pro b/src/script/script.pro
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1312 --- a/src/script/script.pro 2009-11-27 02:27:52.000000000 +0100
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1313 +++ b/src/script/script.pro 2009-12-04 10:30:44.000000000 +0100
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1314 @@ -7,7 +7,7 @@
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1315 DEFINES += QLALR_NO_QSCRIPTGRAMMAR_DEBUG_INFO
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1316 #win32-msvc*\|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000 ### FIXME
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1317
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1318 -unix:QMAKE_PKGCONFIG_REQUIRES = QtCore
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1319 +unix:!win32:QMAKE_PKGCONFIG_REQUIRES = QtCore
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1320
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1321 include(../qbase.pri)
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1322
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1323 diff -urN a/src/scripttools/scripttools.pro b/src/scripttools/scripttools.pro
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1324 --- a/src/scripttools/scripttools.pro 2009-11-27 02:27:54.000000000 +0100
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1325 +++ b/src/scripttools/scripttools.pro 2009-12-04 10:30:44.000000000 +0100
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1326 @@ -5,7 +5,7 @@
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1327 DEFINES += QT_NO_USING_NAMESPACE
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1328 #win32-msvc*\|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1329
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1330 -unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtScript
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1331 +unix:!win32:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtScript
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1332
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1333 include(../qbase.pri)
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1334
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1335 diff -urN a/src/sql/drivers/drivers.pri b/src/sql/drivers/drivers.pri
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1336 --- a/src/sql/drivers/drivers.pri 2009-11-27 02:27:52.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1337 +++ b/src/sql/drivers/drivers.pri 2009-12-04 10:30:44.000000000 +0100
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1338 @@ -6,7 +6,7 @@
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1339 HEADERS += drivers/psql/qsql_psql.h
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1340 SOURCES += drivers/psql/qsql_psql.cpp
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1341
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1342 - unix {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1343 + unix:!win32 {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1344 !isEmpty(QT_LFLAGS_PSQL) {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1345 LIBS *= $$QT_LFLAGS_PSQL
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1346 QMAKE_CXXFLAGS *= $$QT_CFLAGS_PSQL
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1347 @@ -25,7 +25,7 @@
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1348 HEADERS += drivers/mysql/qsql_mysql.h
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1349 SOURCES += drivers/mysql/qsql_mysql.cpp
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1350
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1351 - unix {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1352 + unix:!win32 {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1353 isEmpty(QT_LFLAGS_MYSQL) {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1354 !contains(LIBS, .mysqlclient.):!contains(LIBS, .mysqld.) {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1355 use_libmysqlclient_r:LIBS *= -lmysqlclient_r
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1356 @@ -48,7 +48,7 @@
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1357 SOURCES += drivers/odbc/qsql_odbc.cpp
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1358
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1359 mac:!contains( LIBS, .odbc. ):LIBS *= -liodbc
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1360 - unix:!contains( LIBS, .odbc. ):LIBS *= -lodbc
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1361 + unix:!win32:!contains( LIBS, .odbc. ):LIBS *= -lodbc
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1362
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1363 win32 {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1364 !win32-borland:LIBS *= -lodbc32
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1365 @@ -60,7 +60,7 @@
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1366 HEADERS += drivers/oci/qsql_oci.h
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1367 SOURCES += drivers/oci/qsql_oci.cpp
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1368
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1369 - unix:!contains( LIBS, .clnts. ):LIBS += -lclntsh
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1370 + unix:!win32:!contains( LIBS, .clnts. ):LIBS += -lclntsh
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1371
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1372 win32:LIBS += -loci
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1373 }
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1374 @@ -71,7 +71,7 @@
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1375
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1376 unix:LIBS += -L$SYBASE/lib -lsybdb
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1377
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1378 - win32 {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1379 + win32:!unix {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1380 !win32-borland:LIBS += -lNTWDBLIB
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1381 win32-borland:LIBS += $(BCB)/lib/PSDK/NTWDBLIB.LIB
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1382 }
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1383 @@ -81,7 +81,7 @@
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1384 HEADERS += drivers/db2/qsql_db2.h
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1385 SOURCES += drivers/db2/qsql_db2.cpp
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1386
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1387 - unix:LIBS += -ldb2
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1388 + unix:!win32:LIBS += -ldb2
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1389
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1390 win32 {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1391 !win32-borland:LIBS += -ldb2cli
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1392 @@ -93,7 +93,7 @@
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1393 HEADERS += drivers/ibase/qsql_ibase.h
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1394 SOURCES += drivers/ibase/qsql_ibase.cpp
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1395
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1396 - unix:LIBS *= -lgds
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1397 + unix:!win32:LIBS *= -lgds
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1398
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1399 win32 {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1400 !win32-borland:LIBS *= -lgds32_ms
564 c67df741dfa7 update version of package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 548 diff changeset	1401 diff -urN a/src/sql/drivers/tds/qsql_tds.cpp b/src/sql/drivers/tds/qsql_tds.cpp
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1402 --- a/src/sql/drivers/tds/qsql_tds.cpp 2009-11-27 02:27:52.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1403 +++ b/src/sql/drivers/tds/qsql_tds.cpp 2009-12-04 10:30:44.000000000 +0100
548 08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	1404 @@ -47,7 +47,8 @@
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	1405 #else
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	1406 #define Q_USE_SYBASE
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	1407 #endif
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	1408 -
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	1409 +//Force SYBASE because we use FreeTDS
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	1410 +#define Q_USE_SYBASE
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	1411 #include "qsql_tds.h"
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	1412
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	1413 #include <qvariant.h>
564 c67df741dfa7 update version of package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 548 diff changeset	1414 diff -urN a/src/sql/drivers/tds/qsql_tds.h b/src/sql/drivers/tds/qsql_tds.h
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1415 --- a/src/sql/drivers/tds/qsql_tds.h 2009-11-27 02:27:52.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1416 +++ b/src/sql/drivers/tds/qsql_tds.h 2009-12-04 10:30:44.000000000 +0100
548 08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	1417 @@ -48,7 +48,8 @@
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	1418
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	1419 #ifdef Q_OS_WIN32
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	1420 #define WIN32_LEAN_AND_MEAN
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	1421 -#define DBNTWIN32 // indicates 32bit windows dblib
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	1422 +//#define DBNTWIN32 // indicates 32bit windows dblib
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	1423 +#include <winsock2.h>
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	1424 #include <QtCore/qt_windows.h>
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	1425 #include <sqlfront.h>
08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	1426 #include <sqldb.h>
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1427 diff -urN a/src/sql/sql.pro b/src/sql/sql.pro
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1428 --- a/src/sql/sql.pro 2009-11-27 02:27:52.000000000 +0100
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1429 +++ b/src/sql/sql.pro 2009-12-04 10:30:44.000000000 +0100
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1430 @@ -5,7 +5,7 @@
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1431 DEFINES += QT_NO_USING_NAMESPACE
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1432 win32-msvc*\|win32-icc:QMAKE_LFLAGS += /BASE:0x62000000
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1433
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1434 -unix:QMAKE_PKGCONFIG_REQUIRES = QtCore
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1435 +unix:!win32:QMAKE_PKGCONFIG_REQUIRES = QtCore
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1436
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1437 include(../qbase.pri)
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1438
548 08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	1439 diff -urN a/src/svg/svg.pro b/src/svg/svg.pro
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1440 --- a/src/svg/svg.pro 2009-11-27 02:27:53.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1441 +++ b/src/svg/svg.pro 2009-12-04 10:30:44.000000000 +0100
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1442 @@ -6,7 +6,7 @@
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1443 win32-msvc*\|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1444 solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1445
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1446 -unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1447 +unix:!win32:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1448
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1449 include(../qbase.pri)
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1450
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1451 @@ -44,7 +44,8 @@
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1452
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1453 #zlib support
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1454 contains(QT_CONFIG, zlib) {
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1455 - INCLUDEPATH += ../3rdparty/zlib
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1456 + INCLUDEPATH += ../3rdparty/zlib
548 08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	1457 } else:!contains(QT_CONFIG, no-zlib) {
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1458 - unix:LIBS_PRIVATE += -lz
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1459 + unix\|win32-g++:LIBS_PRIVATE += -lz
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1460 + win32-msvc*\|win32-icc:LIBS += zdll.lib
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1461 }
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1462 diff -urN a/src/testlib/testlib.pro b/src/testlib/testlib.pro
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1463 --- a/src/testlib/testlib.pro 2009-11-27 02:27:52.000000000 +0100
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1464 +++ b/src/testlib/testlib.pro 2009-12-04 10:30:44.000000000 +0100
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1465 @@ -2,7 +2,7 @@
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1466 QPRO_PWD = $$PWD
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1467 QT = core
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1468 INCLUDEPATH += .
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1469 -unix:!embedded:QMAKE_PKGCONFIG_DESCRIPTION = Qt \
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1470 +unix:!win32:!embedded:QMAKE_PKGCONFIG_DESCRIPTION = Qt \
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1471 Unit \
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1472 Testing \
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1473 Library
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1474 diff -urN a/src/tools/bootstrap/bootstrap.pri b/src/tools/bootstrap/bootstrap.pri
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1475 --- a/src/tools/bootstrap/bootstrap.pri 2009-11-27 02:27:53.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1476 +++ b/src/tools/bootstrap/bootstrap.pri 2009-12-04 10:30:44.000000000 +0100
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1477 @@ -52,8 +52,8 @@
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1478 LIBS += -lbootstrap
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1479 }
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1480 !contains(QT_CONFIG, zlib):!contains(QT_CONFIG, no-zlib) {
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1481 - unix:LIBS += -lz
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1482 -# win32:LIBS += libz.lib
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1483 + unix\|win32-g++:LIBS_PRIVATE += -lz
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1484 + win32-msvc*\|win32-icc:LIBS += zdll.lib
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1485 }
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1486 win32:LIBS += -luser32
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1487
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1488 diff -urN a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1489 --- a/src/tools/bootstrap/bootstrap.pro 2009-11-27 02:27:53.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1490 +++ b/src/tools/bootstrap/bootstrap.pro 2009-12-04 10:30:44.000000000 +0100
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1491 @@ -82,7 +82,7 @@
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1492 ../../xml/dom/qdom.cpp \
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1493 ../../xml/sax/qxml.cpp
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1494
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1495 -unix:SOURCES += ../../corelib/io/qfsfileengine_unix.cpp \
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1496 +unix:!win32:SOURCES += ../../corelib/io/qfsfileengine_unix.cpp \
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1497 ../../corelib/io/qfsfileengine_iterator_unix.cpp
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1498
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1499 win32:SOURCES += ../../corelib/io/qfsfileengine_win.cpp \
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1500 @@ -108,6 +108,9 @@
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1501 ../3rdparty/zlib/trees.c \
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1502 ../3rdparty/zlib/uncompr.c \
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1503 ../3rdparty/zlib/zutil.c
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1504 +} else:!contains(QT_CONFIG, no-zlib) {
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1505 + unix\|win32-g++:LIBS_PRIVATE += -lz
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1506 + win32-msvc*\|win32-icc:LIBS += zdll.lib
548 08b6c299a522 several improvements to package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 524 diff changeset	1507 }
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1508
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1509 lib.CONFIG = dummy_install
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1510 diff -urN a/src/winmain/winmain.pro b/src/winmain/winmain.pro
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1511 --- a/src/winmain/winmain.pro 2009-11-27 02:27:53.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1512 +++ b/src/winmain/winmain.pro 2009-12-04 10:30:44.000000000 +0100
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1513 @@ -11,12 +11,12 @@
573 57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1514 win32-g++:DEFINES += QT_NEEDS_QMAIN
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1515 win32-borland:DEFINES += QT_NEEDS_QMAIN
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1516 SOURCES = qtmain_win.cpp
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1517 - CONFIG += png zlib
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1518 + CONFIG += png
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1519 CONFIG -= jpeg
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1520 INCLUDEPATH += tmp $$QMAKE_INCDIR_QT/QtCore
57166e6490d2 use more external libraries in package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 564 diff changeset	1521 }
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1522
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1523 -!win32:error("$$_FILE_ is intended only for Windows!")
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1524 +!win32:warning("$$_FILE_ is intended only for Windows! This warning might be a spurious effect of fromfile function.")
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1525 include(../qbase.pri)
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1526 wince*:QMAKE_POST_LINK =
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1527
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1528 diff -urN a/src/xml/xml.pro b/src/xml/xml.pro
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1529 --- a/src/xml/xml.pro 2009-11-27 02:27:48.000000000 +0100
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1530 +++ b/src/xml/xml.pro 2009-12-04 10:30:44.000000000 +0100
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1531 @@ -4,7 +4,7 @@
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1532 DEFINES += QT_BUILD_XML_LIB QT_NO_USING_NAMESPACE
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1533 win32-msvc*\|win32-icc:QMAKE_LFLAGS += /BASE:0x61000000
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1534
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1535 -unix:QMAKE_PKGCONFIG_REQUIRES = QtCore
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1536 +unix:!win32:QMAKE_PKGCONFIG_REQUIRES = QtCore
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1537
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1538 include(../qbase.pri)
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1539
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1540 diff -urN a/src/xmlpatterns/xmlpatterns.pro b/src/xmlpatterns/xmlpatterns.pro
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1541 --- a/src/xmlpatterns/xmlpatterns.pro 2009-11-27 02:27:53.000000000 +0100
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1542 +++ b/src/xmlpatterns/xmlpatterns.pro 2009-12-04 10:30:44.000000000 +0100
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1543 @@ -4,7 +4,7 @@
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1544 DEFINES += QT_BUILD_XMLPATTERNS_LIB QT_NO_USING_NAMESPACE
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1545 win32-msvc*\|win32-icc:QMAKE_LFLAGS += /BASE:0x61000000
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1546
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1547 -unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtNetwork
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1548 +unix:!win32:QMAKE_PKGCONFIG_REQUIRES = QtCore QtNetwork
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1549
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1550 include(../qbase.pri)
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1551
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1552 diff -urN a/tools/assistant/compat/assistant.pro b/tools/assistant/compat/assistant.pro
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1553 --- a/tools/assistant/compat/assistant.pro 2009-11-27 02:27:46.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1554 +++ b/tools/assistant/compat/assistant.pro 2009-12-04 10:30:44.000000000 +0100
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1555 @@ -6,7 +6,7 @@
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1556
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1557 CONFIG += qt warn_on
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1558
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1559 -unix:contains(QT_CONFIG, dbus):QT += dbus
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1560 +unix:!win32:contains(QT_CONFIG, dbus):QT += dbus
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1561
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1562 build_all:!build_pass {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1563 CONFIG -= build_all
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1564 @@ -67,7 +67,7 @@
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1565
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1566 TRANSLATIONS = assistant_de.ts
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1567
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1568 -unix:!contains(QT_CONFIG, zlib):LIBS += -lz
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1569 +unix:!win32:!contains(QT_CONFIG, zlib):LIBS += -lz
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1570
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1571 contains(CONFIG, static): {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1572 win32 {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1573 diff -urN a/tools/assistant/compat/compat.pro b/tools/assistant/compat/compat.pro
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1574 --- a/tools/assistant/compat/compat.pro 2009-11-27 02:27:46.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1575 +++ b/tools/assistant/compat/compat.pro 2009-12-04 10:30:44.000000000 +0100
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1576 @@ -6,7 +6,7 @@
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1577
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1578 CONFIG += qt warn_on
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1579
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1580 -unix:contains(QT_CONFIG, dbus):QT += dbus
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1581 +unix:!win32:contains(QT_CONFIG, dbus):QT += dbus
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1582
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1583 build_all:!build_pass {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1584 CONFIG -= build_all
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1585 @@ -67,7 +67,7 @@
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1586
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1587 TRANSLATIONS = assistant_de.ts
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1588
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1589 -unix:!contains(QT_CONFIG, zlib):LIBS += -lz
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1590 +unix:!win32:!contains(QT_CONFIG, zlib):LIBS += -lz
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1591
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1592 contains(CONFIG, static): {
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1593 win32 {
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1594 diff -urN a/tools/assistant/compat/lib/lib.pro b/tools/assistant/compat/lib/lib.pro
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1595 --- a/tools/assistant/compat/lib/lib.pro 2009-11-27 02:27:46.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1596 +++ b/tools/assistant/compat/lib/lib.pro 2009-12-04 10:30:44.000000000 +0100
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1597 @@ -19,7 +19,7 @@
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1598 DESTDIR = ../../../../lib
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1599 DLLDESTDIR = ../../../../bin
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1600
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1601 -unix {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1602 +unix:!win32 {
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1603 QMAKE_CFLAGS += $$QMAKE_CFLAGS_SHLIB
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1604 QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_SHLIB
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1605 }
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1606 @@ -67,7 +67,7 @@
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1607 INSTALLS += assistant_headers
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1608 }
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1609
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1610 -unix {
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1611 +unix:!win32 {
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1612 CONFIG += create_pc
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1613 QMAKE_PKGCONFIG_LIBDIR = $$[QT_INSTALL_LIBS]
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1614 QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS]/QtAssistant
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1615 diff -urN a/tools/assistant/lib/fulltextsearch/fulltextsearch.pro b/tools/assistant/lib/fulltextsearch/fulltextsearch.pro
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1616 --- a/tools/assistant/lib/fulltextsearch/fulltextsearch.pro 2009-11-27 02:27:46.000000000 +0100
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1617 +++ b/tools/assistant/lib/fulltextsearch/fulltextsearch.pro 2009-12-04 10:30:44.000000000 +0100
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1618 @@ -23,7 +23,7 @@
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1619 linux-g++:DEFINES += _GLIBCXX_EXTERN_TEMPLATE=0
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1620 }
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1621
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1622 -unix:QMAKE_PKGCONFIG_REQUIRES = QtCore
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1623 +unix:!win32:QMAKE_PKGCONFIG_REQUIRES = QtCore
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1624
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1625 # impossible to disable exceptions in clucene atm
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1626 CONFIG(exceptions_off) {
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1627 diff -urN a/tools/assistant/lib/lib.pro b/tools/assistant/lib/lib.pro
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1628 --- a/tools/assistant/lib/lib.pro 2009-11-27 02:27:46.000000000 +0100
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1629 +++ b/tools/assistant/lib/lib.pro 2009-12-04 10:30:44.000000000 +0100
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1630 @@ -19,7 +19,7 @@
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1631 win32:qclucene = $${qclucene}d
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1632 }
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1633 linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qclucene
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1634 -unix:QMAKE_PKGCONFIG_REQUIRES += QtNetwork \
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1635 +unix:!win32:QMAKE_PKGCONFIG_REQUIRES += QtNetwork \
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1636 QtSql \
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1637 QtXml
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1638 LIBS_PRIVATE += -l$$qclucene
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1639 diff -urN a/tools/designer/src/components/lib/lib.pro b/tools/designer/src/components/lib/lib.pro
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1640 --- a/tools/designer/src/components/lib/lib.pro 2009-11-27 02:27:46.000000000 +0100
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1641 +++ b/tools/designer/src/components/lib/lib.pro 2009-12-04 10:30:44.000000000 +0100
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1642 @@ -64,7 +64,7 @@
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1643 include(../../sharedcomponents.pri)
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1644 include(../component.pri)
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1645
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1646 -unix {
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1647 +unix:!win32 {
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1648 QMAKE_PKGCONFIG_REQUIRES = QtCore QtDesigner QtGui QtXml
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1649 contains(QT_CONFIG, script): QMAKE_PKGCONFIG_REQUIRES += QtScript
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1650 }
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1651 diff -urN a/tools/designer/src/designer/designer.pro b/tools/designer/src/designer/designer.pro
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1652 --- a/tools/designer/src/designer/designer.pro 2009-11-27 02:27:46.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1653 +++ b/tools/designer/src/designer/designer.pro 2009-12-04 10:30:44.000000000 +0100
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1654 @@ -89,5 +89,5 @@
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1655
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1656 include(../sharedcomponents.pri)
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1657
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1658 -unix:!mac:LIBS += -lm
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1659 +unix:!win32:!mac:LIBS += -lm
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1660 TRANSLATIONS = designer_de.ts
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1661 diff -urN a/tools/designer/src/lib/lib.pro b/tools/designer/src/lib/lib.pro
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1662 --- a/tools/designer/src/lib/lib.pro 2009-11-27 02:27:46.000000000 +0100
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1663 +++ b/tools/designer/src/lib/lib.pro 2009-12-04 10:30:44.000000000 +0100
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1664 @@ -13,7 +13,7 @@
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1665 VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1666 }
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1667
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1668 -unix:QMAKE_PKGCONFIG_REQUIRES += QtXml
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1669 +unix:!win32:QMAKE_PKGCONFIG_REQUIRES += QtXml
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1670
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1671 include(../../../../src/qt_targets.pri)
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1672 QMAKE_TARGET_PRODUCT = Designer
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1673 diff -urN a/tools/designer/src/sharedcomponents.pri b/tools/designer/src/sharedcomponents.pri
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1674 --- a/tools/designer/src/sharedcomponents.pri 2009-11-27 02:27:46.000000000 +0100
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1675 +++ b/tools/designer/src/sharedcomponents.pri 2009-12-04 10:30:44.000000000 +0100
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1676 @@ -21,7 +21,7 @@
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1677 }
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1678 }
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1679
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1680 -unix {
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1681 +unix:!win32 {
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1682 CONFIG += create_pc
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1683 QMAKE_PKGCONFIG_LIBDIR = $$[QT_INSTALL_LIBS]
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1684 QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS]/$$TARGET
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1685 diff -urN a/tools/designer/src/uitools/uitools.pro b/tools/designer/src/uitools/uitools.pro
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1686 --- a/tools/designer/src/uitools/uitools.pro 2009-11-27 02:27:46.000000000 +0100
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1687 +++ b/tools/designer/src/uitools/uitools.pro 2009-12-04 10:30:44.000000000 +0100
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1688 @@ -35,7 +35,7 @@
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1689 target.path=$$[QT_INSTALL_LIBS]
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1690 INSTALLS += target
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1691
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1692 -unix {
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1693 +unix:!win32 {
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1694 CONFIG += create_pc
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1695 QMAKE_PKGCONFIG_LIBDIR = $$[QT_INSTALL_LIBS]
d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1696 QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS]/$$TARGET
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1697 diff -urN a/tools/tools.pro b/tools/tools.pro
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1698 --- a/tools/tools.pro 2009-11-27 02:27:47.000000000 +0100
576 d262f9cc5821 some more improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 574 diff changeset	1699 +++ b/tools/tools.pro 2009-12-04 10:30:44.000000000 +0100
574 bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1700 @@ -16,7 +16,7 @@
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1701 SUBDIRS += linguist
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1702 symbian: SUBDIRS = designer
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1703 wince*: SUBDIRS = qtestlib designer
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1704 - unix:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1705 + unix:!win32:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1706 win32:!wince*:SUBDIRS += activeqt
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1707 }
bdd31b51843e various improvements for package qt (by Mark Brand) Volker Grabsch <vog@notjusthosting.com> parents: 573 diff changeset	1708

Mercurial > mxe-octave

annotate src/qt-win32.patch @ 576:d262f9cc5821