Mercurial > mxe-octave

annotate src/qt-win32.patch @ 578:41c0ac9326f2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
improvements for package qt (by Mark Brand)
author Volker Grabsch <vog@notjusthosting.com>
date Sun, 06 Dec 2009 12:07:15 +0100
parents d262f9cc5821
children 407cf0b9f8fc
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
26 +++ b/configure 2009-12-05 20:26:31.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 ;;
564
c67df741dfa7 update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 548
diff changeset
379 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
380 --- a/mkspecs/win32-g++/qmake.conf 2009-11-27 02:27:45.000000000 +0100
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
381 +++ b/mkspecs/win32-g++/qmake.conf 2009-12-05 20:26:31.000000000 +0100
548
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
382 @@ -3,23 +3,31 @@
452
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
383 #
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
384 # Written for MinGW
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
385 #
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
386 +load(qt_config)
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
387
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
388 MAKEFILE_GENERATOR = MINGW
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
389 TEMPLATE = app
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
390 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
391 +CONFIG += windows win32
452
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
392 +CONFIG -= freetype
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
393 +QT_CONFIG -= freetype
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
394 QT += core gui
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
395 DEFINES += UNICODE QT_LARGEFILE_SUPPORT
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
396 +DEFINES -= QT_LARGEFILE_SUPPORT
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
397 +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
398 QMAKE_COMPILER_DEFINES += __GNUC__ WIN32
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
399
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
400 QMAKE_EXT_OBJ = .o
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
401 QMAKE_EXT_RES = _res.o
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
402
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
403 -QMAKE_CC = gcc
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
404 +QMAKE_CC = HOSTPLATFORMPREFIX-gcc
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
405 QMAKE_LEX = flex
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
406 QMAKE_LEXFLAGS =
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
407 QMAKE_YACC = byacc
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
408 QMAKE_YACCFLAGS = -d
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
409 QMAKE_CFLAGS =
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
410 +QMAKE_CFLAGS += -isystem HOSTPLATFORMINCLUDE
548
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
411 +QMAKE_CFLAGS += -pipe
452
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
412 QMAKE_CFLAGS_DEPS = -M
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
413 QMAKE_CFLAGS_WARN_ON = -Wall
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
414 QMAKE_CFLAGS_WARN_OFF = -w
548
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
415 @@ -27,7 +35,7 @@
452
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
416 QMAKE_CFLAGS_DEBUG = -g
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
417 QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
418
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
419 -QMAKE_CXX = g++
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
420 +QMAKE_CXX = HOSTPLATFORMPREFIX-g++
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
421 QMAKE_CXXFLAGS = $$QMAKE_CFLAGS
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
422 QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
423 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
424 @@ -42,6 +50,7 @@
452
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
425 QMAKE_CXXFLAGS_EXCEPTIONS_OFF = -fno-exceptions
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
426
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
427 QMAKE_INCDIR =
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
428 +QMAKE_INCDIR += .
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
429 QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS]
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
430 QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS]
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
431
548
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
432 @@ -50,8 +59,8 @@
452
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
433 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
434 QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
435
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
436 -QMAKE_LINK = g++
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
437 -QMAKE_LINK_C = gcc
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
438 +QMAKE_LINK = HOSTPLATFORMPREFIX-g++
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
439 +QMAKE_LINK_C = HOSTPLATFORMPREFIX-gcc
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
440 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
441 QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads -Wl
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
442 QMAKE_LFLAGS_EXCEPTIONS_OFF =
548
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
443 @@ -72,15 +81,18 @@
452
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
444 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
445 QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
446
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
447 +QMAKE_SH = bash
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
448 +
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
449 !isEmpty(QMAKE_SH) {
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
450 MINGW_IN_SHELL = 1
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
451 QMAKE_DIR_SEP = /
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
452 QMAKE_COPY = cp
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
453 - QMAKE_COPY_DIR = xcopy /s /q /y /i
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
454 + QMAKE_COPY_DIR = cp -r
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
455 QMAKE_MOVE = mv
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
456 QMAKE_DEL_FILE = rm
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
457 - QMAKE_MKDIR = mkdir
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
458 + QMAKE_MKDIR = mkdir -p
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
459 QMAKE_DEL_DIR = rmdir
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
460 + QMAKE_SYMBOLIC_LINK = ln -s
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
461 QMAKE_CHK_DIR_EXISTS = test -d
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
462 } else {
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
463 QMAKE_COPY = copy /y
548
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
464 @@ -92,15 +104,16 @@
452
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
465 QMAKE_CHK_DIR_EXISTS = if not exist
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
466 }
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
467
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
468 -QMAKE_MOC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}moc.exe
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
469 -QMAKE_UIC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}uic.exe
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
470 -QMAKE_IDC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}idc.exe
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
471 -
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
472 -QMAKE_IDL = midl
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
473 -QMAKE_LIB = ar -ru
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
474 -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
475 +#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
476 +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
477 +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
478 +QMAKE_UIC = HOSTPLATFORMPREFIX-uic
452
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
479 +
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
480 +#QMAKE_IDL = midl
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
481 +QMAKE_LIB = HOSTPLATFORMPREFIX-ar -ru
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
482 +QMAKE_RC = HOSTPLATFORMPREFIX-windres
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
483 QMAKE_ZIP = zip -r -9
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
484
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
485 -QMAKE_STRIP = strip
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
486 +QMAKE_STRIP = HOSTPLATFORMPREFIX-strip
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
487 QMAKE_STRIPFLAGS_LIB += --strip-unneeded
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
488 -load(qt_config)
548
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
489 +PKG_CONFIG = HOSTPLATFORMPREFIX-pkg-config
564
c67df741dfa7 update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 548
diff changeset
490 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
491 --- a/src/corelib/tools/tools.pri 2009-11-27 02:27:54.000000000 +0100
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
492 +++ b/src/corelib/tools/tools.pri 2009-12-05 22:54:15.000000000 +0100
573
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
493 @@ -96,8 +96,8 @@
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
494 ../3rdparty/zlib/uncompr.c \
564
c67df741dfa7 update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 548
diff changeset
495 ../3rdparty/zlib/zutil.c
c67df741dfa7 update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 548
diff changeset
496 } 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
497 - unix:LIBS_PRIVATE += -lz
564
c67df741dfa7 update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 548
diff changeset
498 -# 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
499 + unix|win32-g++:LIBS_PRIVATE += -lz
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
500 + win32:!win32-g++:LIBS += zdll.lib
509
e97947e7d45e update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 491
diff changeset
501 }
564
c67df741dfa7 update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 548
diff changeset
502
c67df741dfa7 update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 548
diff changeset
503 DEFINES += HB_EXPORT=Q_CORE_EXPORT
c67df741dfa7 update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 548
diff changeset
504 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
505 --- a/src/gui/image/image.pri 2009-11-27 02:27:52.000000000 +0100
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
506 +++ b/src/gui/image/image.pri 2009-12-05 23:46:14.000000000 +0100
573
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
507 @@ -93,11 +93,11 @@
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
508 SOURCES += image/qpnghandler.cpp
509
e97947e7d45e update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 491
diff changeset
509
564
c67df741dfa7 update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 548
diff changeset
510 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
511 - unix:LIBS_PRIVATE += -lpng
564
c67df741dfa7 update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 548
diff changeset
512 - win32:LIBS += libpng.lib
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
513 + unix|win32-g++:LIBS_PRIVATE += -lpng
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
514 + win32:!win32-g++:LIBS += libpng.lib
564
c67df741dfa7 update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 548
diff changeset
515 } else {
c67df741dfa7 update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 548
diff changeset
516 !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
517 - 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
518 + INCLUDEPATH += ../3rdparty/libpng
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
519 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
520 ../3rdparty/libpng/pngerror.c \
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
521 ../3rdparty/libpng/pngget.c \
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
522 @@ -115,6 +115,10 @@
573
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
523 ../3rdparty/libpng/pngwutil.c \
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
524 ../3rdparty/libpng/pnggccrd.c
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
525 }
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
526 + contains(QT_CONFIG, system-zlib) {
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
527 + unix|win32-g++:LIBS_PRIVATE += -lz
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
528 + win32:!win32-g++:LIBS += zdll.lib
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
529 + }
573
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
530 } else {
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
531 DEFINES *= QT_NO_IMAGEFORMAT_PNG
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
532 }
564
c67df741dfa7 update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 548
diff changeset
533 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
534 --- a/src/gui/painting/painting.pri 2009-11-27 02:27:53.000000000 +0100
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
535 +++ b/src/gui/painting/painting.pri 2009-12-05 23:34:47.000000000 +0100
573
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
536 @@ -380,9 +380,9 @@
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
537 }
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
538
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
539 contains(QT_CONFIG, zlib) {
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
540 - INCLUDEPATH += ../3rdparty/zlib
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
541 + INCLUDEPATH += ../3rdparty/zlib
564
c67df741dfa7 update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 548
diff changeset
542 } 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
543 - unix:LIBS_PRIVATE += -lz
564
c67df741dfa7 update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 548
diff changeset
544 -# 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
545 + unix|win32-g++:LIBS_PRIVATE += -lz
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
546 + win32:!win32-g++:LIBS += zdll.lib
573
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
547 }
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
548
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
549 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
550 --- a/src/network/access/access.pri 2009-11-27 02:27:53.000000000 +0100
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
551 +++ b/src/network/access/access.pri 2009-12-05 22:54:15.000000000 +0100
573
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
552 @@ -57,8 +57,8 @@
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
553
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
554 #zlib support
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
555 contains(QT_CONFIG, zlib) {
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
556 - INCLUDEPATH += ../3rdparty/zlib
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
557 + INCLUDEPATH += ../3rdparty/zlib
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
558 } 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
559 - unix:LIBS_PRIVATE += -lz
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
560 -# win32:LIBS += libz.lib
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
561 + unix|win32-g++:LIBS_PRIVATE += -lz
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
562 + win32:!win32-g++:LIBS += zdll.lib
573
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
563 }
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
564 diff -urN a/src/network/ssl/ssl.pri b/src/network/ssl/ssl.pri
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
565 --- a/src/network/ssl/ssl.pri 2009-11-27 02:27:53.000000000 +0100
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
566 +++ b/src/network/ssl/ssl.pri 2009-12-06 01:41:23.000000000 +0100
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
567 @@ -35,5 +35,12 @@
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
568 RESOURCES += network.qrc
576
d262f9cc5821 some more improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 574
diff changeset
569
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
570 # Add optional SSL libs
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
571 + !contains(QT_CONFIG, system-zlib):contains(OPENSSL_LIBS, -lz) {
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
572 + #Use the zlib in QtCore
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
573 + #-lz probably came from pkg-config which does not know about QtCore
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
574 + OPENSSL_LIBS -= -lz
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
575 + OPENSSL_LIBS += -lQtCore4
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
576 + }
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
577 LIBS_PRIVATE += $$OPENSSL_LIBS
576
d262f9cc5821 some more improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 574
diff changeset
578 +
574
bdd31b51843e various improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 573
diff changeset
579 }
573
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
580 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
581 --- a/src/plugins/imageformats/jpeg/jpeg.pro 2009-11-27 02:27:53.000000000 +0100
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
582 +++ b/src/plugins/imageformats/jpeg/jpeg.pro 2009-12-05 22:11:44.000000000 +0100
573
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
583 @@ -20,8 +20,8 @@
564
c67df741dfa7 update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 548
diff changeset
584 }
509
e97947e7d45e update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 491
diff changeset
585
573
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
586 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
587 - unix:LIBS += -ljpeg
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
588 - win32:LIBS += libjpeg.lib
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
589 + unix|win32-g++:LIBS += -ljpeg
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
590 + win32:!win32-g++:LIBS += libjpeg.lib
573
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
591 }
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
592 !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
593 INCLUDEPATH += ../../../3rdparty/libjpeg
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
594 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
595 --- a/src/plugins/imageformats/mng/mng.pro 2009-11-27 02:27:53.000000000 +0100
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
596 +++ b/src/plugins/imageformats/mng/mng.pro 2009-12-05 22:16:55.000000000 +0100
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
597 @@ -14,8 +14,8 @@
573
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
598 }
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
599
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
600 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
601 - unix:LIBS += -lmng
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
602 - win32:LIBS += libmng.lib
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
603 + unix|win32-g++:LIBS += -lmng
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
604 + win32:!win32-g++:LIBS += libmng.lib
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
605 }
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
606 !contains(QT_CONFIG, system-mng) {
573
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
607 DEFINES += MNG_BUILD_SO
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
608 @@ -44,10 +44,11 @@
573
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
609 }
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
610
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
611 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
612 - LIBS += -lz
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
613 + unix|win32-g++:LIBS_PRIVATE += -lz
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
614 + win32:!win32-g++:LIBS += zdll.lib
576
d262f9cc5821 some more improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 574
diff changeset
615 }
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
616 !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
617 - INCLUDEPATH += ../../../3rdparty/zlib
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
618 + INCLUDEPATH += ../../../3rdparty/zlib
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
619 }
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
620
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
621 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
622 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
623 --- a/src/plugins/imageformats/tiff/tiff.pro 2009-11-27 02:27:53.000000000 +0100
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
624 +++ b/src/plugins/imageformats/tiff/tiff.pro 2009-12-05 22:20:36.000000000 +0100
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
625 @@ -8,8 +8,13 @@
573
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
626 qtiffhandler.cpp
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
627
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
628 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
629 - unix:LIBS += -ltiff
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
630 - win32:LIBS += libtiff.lib
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
631 + unix|win32-g++:LIBS += -ltiff
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
632 + win32:!win32-g++:LIBS += libtiff.lib
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
633 +
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
634 + contains(QT_CONFIG, system-jpeg) {
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
635 + unix|win32-g++:LIBS += -ljpeg
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
636 + win32:!win32-g++:LIBS += libjpeg.lib
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
637 + }
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
638 }
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
639 !contains(QT_CONFIG, system-tiff) {
573
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
640 INCLUDEPATH += ../../../3rdparty/libtiff/libtiff
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
641 @@ -62,10 +67,11 @@
573
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
642 }
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
643
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
644 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
645 - LIBS += -lz
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
646 + unix|win32-g++:LIBS_PRIVATE += -lz
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
647 + win32:!win32-g++:LIBS += zdll.lib
576
d262f9cc5821 some more improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 574
diff changeset
648 }
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
649 !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
650 - INCLUDEPATH += ../../../3rdparty/zlib
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
651 + INCLUDEPATH += ../../../3rdparty/zlib
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
652 }
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
653
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
654 QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/imageformats
564
c67df741dfa7 update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 548
diff changeset
655 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
656 --- a/src/plugins/sqldrivers/tds/main.cpp 2009-11-27 02:27:53.000000000 +0100
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
657 +++ b/src/plugins/sqldrivers/tds/main.cpp 2009-12-05 20:26:31.000000000 +0100
548
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
658 @@ -47,6 +47,7 @@
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
659 #define _WINSCARD_H_
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
660 #include <windows.h>
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
661 #endif
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
662 +#define Q_USE_SYBASE
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
663 #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
664
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
665 QT_BEGIN_NAMESPACE
564
c67df741dfa7 update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 548
diff changeset
666 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
667 --- a/src/plugins/sqldrivers/tds/tds.pro 2009-11-27 02:27:53.000000000 +0100
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
668 +++ b/src/plugins/sqldrivers/tds/tds.pro 2009-12-05 22:25:53.000000000 +0100
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
669 @@ -6,8 +6,9 @@
548
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
670 ../../../sql/drivers/tds/qsql_tds.cpp
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
671
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
672 unix:!contains( LIBS, .*sybdb.* ):LIBS *= -lsybdb
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
673 +win32-g++:LIBS *= -lsybdb -liconv -lws2_32
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
674
548
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
675 -win32 {
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
676 +win32:!win32-g++ {
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
677 !win32-borland:LIBS *= -lNTWDBLIB
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
678 win32-borland:LIBS *= $(BCB)/lib/PSDK/NTWDBLIB.LIB
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
679 }
573
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
680 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
681 --- a/src/qbase.pri 2009-11-27 02:27:54.000000000 +0100
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
682 +++ b/src/qbase.pri 2009-12-05 20:26:31.000000000 +0100
573
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
683 @@ -85,7 +85,6 @@
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
684 }
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
685
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
686 win32 {
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
687 - CONFIG += zlib
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
688 INCLUDEPATH += tmp
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
689 !static: DEFINES+=QT_MAKEDLL
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
690 }
564
c67df741dfa7 update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 548
diff changeset
691 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
692 --- a/src/sql/drivers/tds/qsql_tds.cpp 2009-11-27 02:27:52.000000000 +0100
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
693 +++ b/src/sql/drivers/tds/qsql_tds.cpp 2009-12-05 20:26:31.000000000 +0100
548
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
694 @@ -47,7 +47,8 @@
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
695 #else
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
696 #define Q_USE_SYBASE
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
697 #endif
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
698 -
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
699 +//Force SYBASE because we use FreeTDS
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
700 +#define Q_USE_SYBASE
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
701 #include "qsql_tds.h"
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
702
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
703 #include <qvariant.h>
564
c67df741dfa7 update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 548
diff changeset
704 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
705 --- a/src/sql/drivers/tds/qsql_tds.h 2009-11-27 02:27:52.000000000 +0100
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
706 +++ b/src/sql/drivers/tds/qsql_tds.h 2009-12-05 20:26:31.000000000 +0100
548
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
707 @@ -48,7 +48,8 @@
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
708
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
709 #ifdef Q_OS_WIN32
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
710 #define WIN32_LEAN_AND_MEAN
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
711 -#define DBNTWIN32 // indicates 32bit windows dblib
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
712 +//#define DBNTWIN32 // indicates 32bit windows dblib
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
713 +#include <winsock2.h>
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
714 #include <QtCore/qt_windows.h>
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
715 #include <sqlfront.h>
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
716 #include <sqldb.h>
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
717 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
718 --- a/src/svg/svg.pro 2009-11-27 02:27:53.000000000 +0100
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
719 +++ b/src/svg/svg.pro 2009-12-05 22:54:06.000000000 +0100
573
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
720 @@ -44,7 +44,8 @@
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
721
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
722 #zlib support
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
723 contains(QT_CONFIG, zlib) {
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
724 - INCLUDEPATH += ../3rdparty/zlib
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
725 + INCLUDEPATH += ../3rdparty/zlib
548
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
726 } 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
727 - unix:LIBS_PRIVATE += -lz
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
728 + unix|win32-g++:LIBS_PRIVATE += -lz
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
729 + win32:!win32-g++:LIBS += zdll.lib
573
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
730 }
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
731 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
732 --- a/src/tools/bootstrap/bootstrap.pri 2009-11-27 02:27:53.000000000 +0100
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
733 +++ b/src/tools/bootstrap/bootstrap.pri 2009-12-05 22:52:58.000000000 +0100
573
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
734 @@ -52,8 +52,8 @@
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
735 LIBS += -lbootstrap
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
736 }
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
737 !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
738 - unix:LIBS += -lz
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
739 -# win32:LIBS += libz.lib
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
740 + unix|win32-g++:LIBS_PRIVATE += -lz
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
741 + win32:!win32-g++:LIBS += zdll.lib
573
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
742 }
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
743 win32:LIBS += -luser32
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
744
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
745 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
746 --- a/src/tools/bootstrap/bootstrap.pro 2009-11-27 02:27:53.000000000 +0100
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
747 +++ b/src/tools/bootstrap/bootstrap.pro 2009-12-05 22:54:15.000000000 +0100
573
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
748 @@ -108,6 +108,9 @@
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
749 ../3rdparty/zlib/trees.c \
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
750 ../3rdparty/zlib/uncompr.c \
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
751 ../3rdparty/zlib/zutil.c
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
752 +} 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
753 + unix|win32-g++:LIBS_PRIVATE += -lz
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
754 + win32:!win32-g++:LIBS += zdll.lib
548
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
755 }
573
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
756
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
757 lib.CONFIG = dummy_install
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
758 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
759 --- a/src/winmain/winmain.pro 2009-11-27 02:27:53.000000000 +0100
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
760 +++ b/src/winmain/winmain.pro 2009-12-05 20:26:31.000000000 +0100
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
761 @@ -11,7 +11,7 @@
573
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
762 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
763 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
764 SOURCES = qtmain_win.cpp
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
765 - CONFIG += png zlib
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
766 + CONFIG += png
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
767 CONFIG -= jpeg
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
768 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
769 }
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
770 diff -urN a/tools/qvfb/qvfb.pro b/tools/qvfb/qvfb.pro
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
771 --- a/tools/qvfb/qvfb.pro 2009-11-27 02:27:47.000000000 +0100
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
772 +++ b/tools/qvfb/qvfb.pro 2009-12-05 23:36:47.000000000 +0100
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
773 @@ -42,12 +42,14 @@
576
d262f9cc5821 some more improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 574
diff changeset
774 }
d262f9cc5821 some more improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 574
diff changeset
775
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
776 contains(QT_CONFIG, system-png) {
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
777 - LIBS += -lpng
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
778 + unix|win32-g++:LIBS_PRIVATE += -lpng
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
779 + win32:!win32-g++:LIBS += libpng.lib
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
780 } else {
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
781 INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/libpng
576
d262f9cc5821 some more improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 574
diff changeset
782 }
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
783 contains(QT_CONFIG, system-zlib) {
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
784 - LIBS += -lz
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
785 + unix|win32-g++:LIBS_PRIVATE += -lz
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
786 + win32:!win32-g++:LIBS += zdll.lib
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
787 } else {
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
788 INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/zlib
576
d262f9cc5821 some more improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 574
diff changeset
789 }