Mercurial > mxe-octave

annotate src/qt-win32.patch @ 574:bdd31b51843e

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