Mercurial > mxe-octave
annotate src/qt-win32.patch @ 564:c67df741dfa7
update version of package qt (by Mark Brand)
author | Volker Grabsch <vog@notjusthosting.com> |
---|---|
date | Wed, 02 Dec 2009 13:07:46 +0100 |
parents | 08b6c299a522 |
children | 57166e6490d2 |
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 |
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
25 --- a/configure 2009-11-11 14:15:38.000000000 +0100 |
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
26 +++ b/configure 2009-11-17 12:21:07.000000000 +0100 |
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
27 @@ -601,7 +601,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 |
564
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
36 @@ -727,6 +727,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 |
564
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
44 @@ -4420,7 +4421,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 |
564
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
56 @@ -4428,7 +4432,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 |
564
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
68 @@ -4437,7 +4444,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 |
564
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
80 @@ -4446,7 +4456,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 |
564
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
92 @@ -4455,13 +4468,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" |
564
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
120 @@ -4487,7 +4513,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 |
564
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
132 @@ -4504,7 +4533,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 |
564
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
144 @@ -4531,7 +4563,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 |
564
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
156 @@ -4548,7 +4583,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 |
564
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
168 @@ -4557,7 +4595,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 |
564
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
180 @@ -4624,7 +4665,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` |
564
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
192 @@ -4652,7 +4696,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 |
564
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
204 @@ -4697,7 +4744,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 |
564
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
218 @@ -4779,7 +4831,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 |
564
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
233 @@ -4850,7 +4908,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 |
564
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
244 @@ -5010,7 +5070,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) |
564
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
255 @@ -5084,7 +5146,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*) |
564
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
266 @@ -5585,7 +5649,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 |
564
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
278 @@ -5607,7 +5674,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 |
564
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
290 @@ -5738,7 +5808,9 @@ |
548
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
291 |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
292 # detect OpenSSL |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
293 if [ "$CFG_OPENSSL" != "no" ]; then |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
294 - 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
|
295 + if [ "$XPLATFORM" = "win32-g++" ]; then |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
296 + 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
|
297 + 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
|
298 if [ "$CFG_OPENSSL" = "auto" ]; then |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
299 CFG_OPENSSL=yes |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
300 fi |
564
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
301 @@ -6083,6 +6155,7 @@ |
524
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
302 [ "$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
|
303 [ "$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
|
304 [ "$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
|
305 +[ "$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
|
306 [ "$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
|
307 [ "$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
|
308 if [ "$CFG_IPV6" = "yes" ]; then |
564
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
309 @@ -6163,11 +6236,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
|
310 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
|
311 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
|
312 |
1503cb754dde
disable a disturbing build mechanism which is unnecessary when cross compiling in package qt
Volker Grabsch <vog@notjusthosting.com>
parents:
482
diff
changeset
|
313 -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
|
314 - #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
|
315 - #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
|
316 - [ "$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
|
317 -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
|
318 +# 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
|
319 +#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
|
320 +# #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
|
321 +# #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
|
322 +# [ "$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
|
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 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
|
325 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
|
326 elif [ "$CFG_ZLIB" = "system" ]; then |
564
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
327 @@ -7098,7 +7172,7 @@ |
524
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
328 |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
329 cat >>"$QTCONFIG.tmp" <<EOF |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
330 #configuration |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
331 -CONFIG += $QTCONFIG_CONFIG |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
332 +CONFIG += $QMAKE_CONFIG $QTCONFIG_CONFIG |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
333 QT_ARCH = $CFG_ARCH |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
334 QT_EDITION = $Edition |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
335 QT_CONFIG += $QT_CONFIG |
564
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
336 @@ -7190,7 +7264,7 @@ |
548
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
337 if [ '!' -z "$OPENSSL_LIBS" ]; then |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
338 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
|
339 elif [ "$CFG_OPENSSL" = "linked" ]; then |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
340 - 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
|
341 + 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
|
342 fi |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
343 |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
344 #dump in the SDK info |
564
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
345 @@ -7371,7 +7445,7 @@ |
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
346 echo "Declarative module .. $CFG_DECLARATIVE" |
524
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
347 echo "STL support ......... $CFG_STL" |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
348 echo "PCH support ......... $CFG_PRECOMPILE" |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
349 -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
|
350 +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
|
351 if [ "${CFG_ARCH}" = "arm" ]; then |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
352 echo "iWMMXt support ...... ${CFG_IWMMXT}" |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
353 fi |
564
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
354 @@ -7684,7 +7758,11 @@ |
452
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
355 [ "$IN_ROOT" = "no" ] && continue |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
356 |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
357 case $a in |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
358 - *winmain/winmain.pro) continue ;; |
482
d2e34271758b
cleanup in the win32 patch of package qt
Volker Grabsch <vog@notjusthosting.com>
parents:
479
diff
changeset
|
359 + *winmain/winmain.pro) |
d2e34271758b
cleanup in the win32 patch of package qt
Volker Grabsch <vog@notjusthosting.com>
parents:
479
diff
changeset
|
360 + case "$XPLATFORM" in |
d2e34271758b
cleanup in the win32 patch of package qt
Volker Grabsch <vog@notjusthosting.com>
parents:
479
diff
changeset
|
361 + win32*) SPEC=$XQMAKESPEC ;; |
d2e34271758b
cleanup in the win32 patch of package qt
Volker Grabsch <vog@notjusthosting.com>
parents:
479
diff
changeset
|
362 + *) continue ;; |
d2e34271758b
cleanup in the win32 patch of package qt
Volker Grabsch <vog@notjusthosting.com>
parents:
479
diff
changeset
|
363 + esac ;; |
452
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
364 *s60main/s60main.pro) continue ;; |
564
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
365 *examples/activeqt/*) continue ;; |
452
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
366 */qmake/qmake.pro) continue ;; |
564
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
367 diff -urN a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf |
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
368 --- a/mkspecs/win32-g++/qmake.conf 2009-11-11 14:15:37.000000000 +0100 |
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
369 +++ b/mkspecs/win32-g++/qmake.conf 2009-11-17 12:21:07.000000000 +0100 |
548
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
370 @@ -3,23 +3,31 @@ |
452
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
371 # |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
372 # Written for MinGW |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
373 # |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
374 +load(qt_config) |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
375 |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
376 MAKEFILE_GENERATOR = MINGW |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
377 TEMPLATE = app |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
378 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
|
379 +CONFIG += windows win32 |
452
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
380 +CONFIG -= freetype |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
381 +QT_CONFIG -= freetype |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
382 QT += core gui |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
383 DEFINES += UNICODE QT_LARGEFILE_SUPPORT |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
384 +DEFINES -= QT_LARGEFILE_SUPPORT |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
385 +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
|
386 QMAKE_COMPILER_DEFINES += __GNUC__ WIN32 |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
387 |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
388 QMAKE_EXT_OBJ = .o |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
389 QMAKE_EXT_RES = _res.o |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
390 |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
391 -QMAKE_CC = gcc |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
392 +QMAKE_CC = HOSTPLATFORMPREFIX-gcc |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
393 QMAKE_LEX = flex |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
394 QMAKE_LEXFLAGS = |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
395 QMAKE_YACC = byacc |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
396 QMAKE_YACCFLAGS = -d |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
397 QMAKE_CFLAGS = |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
398 +QMAKE_CFLAGS += -isystem HOSTPLATFORMINCLUDE |
548
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
399 +QMAKE_CFLAGS += -pipe |
452
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
400 QMAKE_CFLAGS_DEPS = -M |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
401 QMAKE_CFLAGS_WARN_ON = -Wall |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
402 QMAKE_CFLAGS_WARN_OFF = -w |
548
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
403 @@ -27,7 +35,7 @@ |
452
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
404 QMAKE_CFLAGS_DEBUG = -g |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
405 QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
406 |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
407 -QMAKE_CXX = g++ |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
408 +QMAKE_CXX = HOSTPLATFORMPREFIX-g++ |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
409 QMAKE_CXXFLAGS = $$QMAKE_CFLAGS |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
410 QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
411 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
|
412 @@ -42,6 +50,7 @@ |
452
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
413 QMAKE_CXXFLAGS_EXCEPTIONS_OFF = -fno-exceptions |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
414 |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
415 QMAKE_INCDIR = |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
416 +QMAKE_INCDIR += . |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
417 QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
418 QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
419 |
548
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
420 @@ -50,8 +59,8 @@ |
452
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
421 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
|
422 QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
423 |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
424 -QMAKE_LINK = g++ |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
425 -QMAKE_LINK_C = gcc |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
426 +QMAKE_LINK = HOSTPLATFORMPREFIX-g++ |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
427 +QMAKE_LINK_C = HOSTPLATFORMPREFIX-gcc |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
428 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
|
429 QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads -Wl |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
430 QMAKE_LFLAGS_EXCEPTIONS_OFF = |
548
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
431 @@ -72,15 +81,18 @@ |
452
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
432 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
|
433 QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
434 |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
435 +QMAKE_SH = bash |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
436 + |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
437 !isEmpty(QMAKE_SH) { |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
438 MINGW_IN_SHELL = 1 |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
439 QMAKE_DIR_SEP = / |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
440 QMAKE_COPY = cp |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
441 - QMAKE_COPY_DIR = xcopy /s /q /y /i |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
442 + QMAKE_COPY_DIR = cp -r |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
443 QMAKE_MOVE = mv |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
444 QMAKE_DEL_FILE = rm |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
445 - QMAKE_MKDIR = mkdir |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
446 + QMAKE_MKDIR = mkdir -p |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
447 QMAKE_DEL_DIR = rmdir |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
448 + QMAKE_SYMBOLIC_LINK = ln -s |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
449 QMAKE_CHK_DIR_EXISTS = test -d |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
450 } else { |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
451 QMAKE_COPY = copy /y |
548
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
452 @@ -92,15 +104,16 @@ |
452
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
453 QMAKE_CHK_DIR_EXISTS = if not exist |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
454 } |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
455 |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
456 -QMAKE_MOC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}moc.exe |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
457 -QMAKE_UIC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}uic.exe |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
458 -QMAKE_IDC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}idc.exe |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
459 - |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
460 -QMAKE_IDL = midl |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
461 -QMAKE_LIB = ar -ru |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
462 -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
|
463 +#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
|
464 +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
|
465 +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
|
466 +QMAKE_UIC = HOSTPLATFORMPREFIX-uic |
452
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
467 + |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
468 +#QMAKE_IDL = midl |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
469 +QMAKE_LIB = HOSTPLATFORMPREFIX-ar -ru |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
470 +QMAKE_RC = HOSTPLATFORMPREFIX-windres |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
471 QMAKE_ZIP = zip -r -9 |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
472 |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
473 -QMAKE_STRIP = strip |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
474 +QMAKE_STRIP = HOSTPLATFORMPREFIX-strip |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
475 QMAKE_STRIPFLAGS_LIB += --strip-unneeded |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
476 -load(qt_config) |
548
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
477 +PKG_CONFIG = HOSTPLATFORMPREFIX-pkg-config |
564
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
478 diff -urN a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pro b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pro |
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
479 --- a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pro 2009-11-11 14:15:37.000000000 +0100 |
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
480 +++ b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pro 2009-11-17 12:21:07.000000000 +0100 |
548
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
481 @@ -16,7 +16,7 @@ |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
482 include($$QT_SOURCE_TREE/src/qbase.pri) |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
483 INSTALLS = |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
484 DESTDIR = $$OLDDESTDIR |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
485 - PRECOMPILED_HEADER = $$PWD/../WebKit/qt/WebKit_pch.h |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
486 + PRECOMPILED_HEADER = $$PWD/../../webkit/WebKit/qt/WebKit_pch.h |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
487 DEFINES *= NDEBUG |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
488 } |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
489 |
564
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
490 diff -urN a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri |
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
491 --- a/src/corelib/tools/tools.pri 2009-11-11 14:15:37.000000000 +0100 |
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
492 +++ b/src/corelib/tools/tools.pri 2009-11-17 12:21:07.000000000 +0100 |
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
493 @@ -97,7 +97,7 @@ |
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
494 ../3rdparty/zlib/zutil.c |
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
495 } else:!contains(QT_CONFIG, no-zlib) { |
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
496 unix:LIBS_PRIVATE += -lz |
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
497 -# win32:LIBS += libz.lib |
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
498 + win32:LIBS += -lz |
509
e97947e7d45e
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
491
diff
changeset
|
499 } |
564
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
500 |
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
501 DEFINES += HB_EXPORT=Q_CORE_EXPORT |
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
502 diff -urN a/src/gui/image/image.pri b/src/gui/image/image.pri |
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
503 --- a/src/gui/image/image.pri 2009-11-11 14:15:37.000000000 +0100 |
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
504 +++ b/src/gui/image/image.pri 2009-11-17 12:21:07.000000000 +0100 |
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
505 @@ -94,7 +94,10 @@ |
509
e97947e7d45e
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
491
diff
changeset
|
506 |
564
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
507 contains(QT_CONFIG, system-png) { |
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
508 unix:LIBS_PRIVATE += -lpng |
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
509 - win32:LIBS += libpng.lib |
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
510 + win32:LIBS += -lpng |
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
511 + contains(QT_CONFIG, system-zlib) { |
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
512 + win32:LIBS += -lz |
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
513 + } |
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
514 } else { |
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
515 !isEqual(QT_ARCH, i386):!isEqual(QT_ARCH, x86_64):DEFINES += PNG_NO_ASSEMBLER_CODE |
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
516 INCLUDEPATH += ../3rdparty/libpng ../3rdparty/zlib |
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
517 diff -urN a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri |
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
518 --- a/src/gui/painting/painting.pri 2009-11-11 14:15:37.000000000 +0100 |
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
519 +++ b/src/gui/painting/painting.pri 2009-11-17 12:21:07.000000000 +0100 |
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
520 @@ -384,6 +384,6 @@ |
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
521 INCLUDEPATH += ../3rdparty/zlib |
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
522 } else:!contains(QT_CONFIG, no-zlib) { |
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
523 unix:LIBS_PRIVATE += -lz |
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
524 -# win32:LIBS += libz.lib |
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
525 + win32:LIBS += -lz |
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
526 } |
509
e97947e7d45e
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
491
diff
changeset
|
527 |
564
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
528 diff -urN a/src/plugins/sqldrivers/tds/main.cpp b/src/plugins/sqldrivers/tds/main.cpp |
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
529 --- a/src/plugins/sqldrivers/tds/main.cpp 2009-11-11 14:15:37.000000000 +0100 |
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
530 +++ b/src/plugins/sqldrivers/tds/main.cpp 2009-11-17 12:21:07.000000000 +0100 |
548
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
531 @@ -47,6 +47,7 @@ |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
532 #define _WINSCARD_H_ |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
533 #include <windows.h> |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
534 #endif |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
535 +#define Q_USE_SYBASE |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
536 #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
|
537 |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
538 QT_BEGIN_NAMESPACE |
564
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
539 diff -urN a/src/plugins/sqldrivers/tds/tds.pro b/src/plugins/sqldrivers/tds/tds.pro |
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
540 --- a/src/plugins/sqldrivers/tds/tds.pro 2009-11-11 14:15:37.000000000 +0100 |
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
541 +++ b/src/plugins/sqldrivers/tds/tds.pro 2009-11-17 12:21:07.000000000 +0100 |
548
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
542 @@ -5,11 +5,6 @@ |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
543 SOURCES = main.cpp \ |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
544 ../../../sql/drivers/tds/qsql_tds.cpp |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
545 |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
546 -unix:!contains( LIBS, .*sybdb.* ):LIBS *= -lsybdb |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
547 - |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
548 -win32 { |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
549 - !win32-borland:LIBS *= -lNTWDBLIB |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
550 - 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
|
551 -} |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
552 - |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
553 +#Patched to use FreeTDS targetting MinGW |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
554 +LIBS *= -lsybdb -liconv -lws2_32 |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
555 include(../qsqldriverbase.pri) |
564
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
556 diff -urN a/src/sql/drivers/tds/qsql_tds.cpp b/src/sql/drivers/tds/qsql_tds.cpp |
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
557 --- a/src/sql/drivers/tds/qsql_tds.cpp 2009-11-11 14:15:37.000000000 +0100 |
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
558 +++ b/src/sql/drivers/tds/qsql_tds.cpp 2009-11-17 12:21:07.000000000 +0100 |
548
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
559 @@ -47,7 +47,8 @@ |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
560 #else |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
561 #define Q_USE_SYBASE |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
562 #endif |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
563 - |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
564 +//Force SYBASE because we use FreeTDS |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
565 +#define Q_USE_SYBASE |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
566 #include "qsql_tds.h" |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
567 |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
568 #include <qvariant.h> |
564
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
569 diff -urN a/src/sql/drivers/tds/qsql_tds.h b/src/sql/drivers/tds/qsql_tds.h |
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
570 --- a/src/sql/drivers/tds/qsql_tds.h 2009-11-11 14:15:37.000000000 +0100 |
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
571 +++ b/src/sql/drivers/tds/qsql_tds.h 2009-11-17 12:21:07.000000000 +0100 |
548
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
572 @@ -48,7 +48,8 @@ |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
573 |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
574 #ifdef Q_OS_WIN32 |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
575 #define WIN32_LEAN_AND_MEAN |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
576 -#define DBNTWIN32 // indicates 32bit windows dblib |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
577 +//#define DBNTWIN32 // indicates 32bit windows dblib |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
578 +#include <winsock2.h> |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
579 #include <QtCore/qt_windows.h> |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
580 #include <sqlfront.h> |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
581 #include <sqldb.h> |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
582 diff -urN a/src/svg/svg.pro b/src/svg/svg.pro |
564
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
583 --- a/src/svg/svg.pro 2009-11-11 14:15:37.000000000 +0100 |
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
584 +++ b/src/svg/svg.pro 2009-11-17 12:21:07.000000000 +0100 |
548
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
585 @@ -47,4 +47,5 @@ |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
586 INCLUDEPATH += ../3rdparty/zlib |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
587 } else:!contains(QT_CONFIG, no-zlib) { |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
588 unix:LIBS_PRIVATE += -lz |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
589 + win32:LIBS += -lz |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
590 } |