Mercurial > mxe-octave
annotate src/qt-win32.patch @ 786:d3d9a4a2843d
revert openssl hacks in configure and use pg_config in package qt
author | Mark Brand <mabrand@mabrand.nl> |
---|---|
date | Wed, 17 Feb 2010 21:57:56 +0100 |
parents | 1d651946e889 |
children | d57d5de5d4b2 |
rev | line source |
---|---|
758
1f5b2dfe8966
restore all patch headers
Volker Grabsch <vog@notjusthosting.com>
parents:
757
diff
changeset
|
1 This file is part of mingw-cross-env. |
1f5b2dfe8966
restore all patch headers
Volker Grabsch <vog@notjusthosting.com>
parents:
757
diff
changeset
|
2 See doc/index.html for further information. |
1f5b2dfe8966
restore all patch headers
Volker Grabsch <vog@notjusthosting.com>
parents:
757
diff
changeset
|
3 |
597
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
4 diff --git a/configure b/configure |
786
d3d9a4a2843d
revert openssl hacks in configure and use pg_config in package qt
Mark Brand <mabrand@mabrand.nl>
parents:
785
diff
changeset
|
5 index ed5891f..1a3f573 100755 |
597
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
6 --- a/configure |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
7 +++ b/configure |
648
c661a75806b6
update version of package qt
Mark Brand <mabrand@mabrand.nl>
parents:
641
diff
changeset
|
8 @@ -605,7 +605,7 @@ mkdir -p "$outpath/config.tests" |
452
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
9 rm -f "$outpath/config.tests/.qmake.cache" |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
10 cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache" |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
11 |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
12 -QMakeVar add styles "cde mac motif plastique cleanlooks windows" |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
13 +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
|
14 QMakeVar add decorations "default windows styled" |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
15 QMakeVar add mouse-drivers "pc" |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
16 if [ "$UNAME_SYSTEM" = "Linux" ] ; then |
648
c661a75806b6
update version of package qt
Mark Brand <mabrand@mabrand.nl>
parents:
641
diff
changeset
|
17 @@ -733,6 +733,7 @@ CFG_MMX=auto |
524
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
18 CFG_3DNOW=auto |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
19 CFG_SSE=auto |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
20 CFG_SSE2=auto |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
21 +CFG_RTTI=auto |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
22 CFG_REDUCE_RELOCATIONS=no |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
23 CFG_IPV6=auto |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
24 CFG_NAS=no |
648
c661a75806b6
update version of package qt
Mark Brand <mabrand@mabrand.nl>
parents:
641
diff
changeset
|
25 @@ -4466,7 +4467,10 @@ fi # Build qmake |
548
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
26 #------------------------------------------------------------------------------- |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
27 |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
28 # 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
|
29 -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
|
30 +if [ "$XPLATFORM" = "win32-g++" ]; then |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
31 + 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
|
32 + CFG_USE_FLOATMATH=yes |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
33 +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
|
34 CFG_USE_FLOATMATH=yes |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
35 else |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
36 CFG_USE_FLOATMATH=no |
648
c661a75806b6
update version of package qt
Mark Brand <mabrand@mabrand.nl>
parents:
641
diff
changeset
|
37 @@ -4474,7 +4478,10 @@ fi |
524
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
38 |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
39 # detect mmx support |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
40 if [ "${CFG_MMX}" = "auto" ]; then |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
41 - 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
|
42 + if [ "$XPLATFORM" = "win32-g++" ]; then |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
43 + echo "Using MMX for win32-g++ target" |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
44 + CFG_MMX=yes |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
45 + 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
|
46 CFG_MMX=yes |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
47 else |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
48 CFG_MMX=no |
648
c661a75806b6
update version of package qt
Mark Brand <mabrand@mabrand.nl>
parents:
641
diff
changeset
|
49 @@ -4483,7 +4490,10 @@ fi |
524
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
50 |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
51 # detect 3dnow support |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
52 if [ "${CFG_3DNOW}" = "auto" ]; then |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
53 - 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
|
54 + if [ "$XPLATFORM" = "win32-g++" ]; then |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
55 + echo "Using SSE for win32-g++ target" |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
56 + CFG_3DNOW=yes |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
57 + 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
|
58 CFG_3DNOW=yes |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
59 else |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
60 CFG_3DNOW=no |
648
c661a75806b6
update version of package qt
Mark Brand <mabrand@mabrand.nl>
parents:
641
diff
changeset
|
61 @@ -4492,7 +4502,10 @@ fi |
524
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
62 |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
63 # detect sse support |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
64 if [ "${CFG_SSE}" = "auto" ]; then |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
65 - 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
|
66 + if [ "$XPLATFORM" = "win32-g++" ]; then |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
67 + echo "Using SSE for win32-g++ target" |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
68 + CFG_SSE=yes |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
69 + 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
|
70 CFG_SSE=yes |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
71 else |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
72 CFG_SSE=no |
648
c661a75806b6
update version of package qt
Mark Brand <mabrand@mabrand.nl>
parents:
641
diff
changeset
|
73 @@ -4501,13 +4514,26 @@ fi |
524
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
74 |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
75 # detect sse2 support |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
76 if [ "${CFG_SSE2}" = "auto" ]; then |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
77 - 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
|
78 + if [ "$XPLATFORM" = "win32-g++" ]; then |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
79 + echo "Using SSE2 for win32-g++ target" |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
80 + CFG_SSE2=yes |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
81 + 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
|
82 CFG_SSE2=yes |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
83 else |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
84 CFG_SSE2=no |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
85 fi |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
86 fi |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
87 |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
88 +# detect rtti support |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
89 +if [ "${CFG_RTTI}" = "auto" ]; then |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
90 + if [ "$XPLATFORM" = "win32-g++" ]; then |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
91 + echo "Using RTTI for win32-g++ target" |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
92 + CFG_RTTI=yes |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
93 + else |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
94 + CFG_RTTI=no |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
95 + fi |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
96 +fi |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
97 + |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
98 # check iWMMXt support |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
99 if [ "$CFG_IWMMXT" = "yes" ]; then |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
100 "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/iwmmxt "iwmmxt" $L_FLAGS $I_FLAGS $l_FLAGS "-mcpu=iwmmxt" |
648
c661a75806b6
update version of package qt
Mark Brand <mabrand@mabrand.nl>
parents:
641
diff
changeset
|
101 @@ -4542,7 +4568,10 @@ if [ "$CFG_ZLIB" = "no" ]; then |
548
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
102 ZLIB_FORCED=yes |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
103 fi |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
104 if [ "$CFG_ZLIB" = "auto" ]; then |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
105 - 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
|
106 + if [ "$XPLATFORM" = "win32-g++" ]; then |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
107 + 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
|
108 + CFG_ZLIB=system |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
109 + 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
|
110 CFG_ZLIB=system |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
111 else |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
112 CFG_ZLIB=yes |
648
c661a75806b6
update version of package qt
Mark Brand <mabrand@mabrand.nl>
parents:
641
diff
changeset
|
113 @@ -4559,7 +4588,10 @@ if [ "$CFG_JPEG" = "auto" ]; then |
548
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
114 fi |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
115 # detect jpeg |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
116 if [ "$CFG_LIBJPEG" = "auto" ]; then |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
117 - 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
|
118 + if [ "$XPLATFORM" = "win32-g++" ]; then |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
119 + 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
|
120 + CFG_LIBJPEG=system |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
121 + 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
|
122 CFG_LIBJPEG=system |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
123 else |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
124 CFG_LIBJPEG=qt |
648
c661a75806b6
update version of package qt
Mark Brand <mabrand@mabrand.nl>
parents:
641
diff
changeset
|
125 @@ -4586,7 +4618,10 @@ fi |
548
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
126 |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
127 # detect tiff |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
128 if [ "$CFG_LIBTIFF" = "auto" ]; then |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
129 - 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
|
130 + if [ "$XPLATFORM" = "win32-g++" ]; then |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
131 + 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
|
132 + CFG_LIBTIFF=system |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
133 + 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
|
134 CFG_LIBTIFF=system |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
135 else |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
136 CFG_LIBTIFF=qt |
648
c661a75806b6
update version of package qt
Mark Brand <mabrand@mabrand.nl>
parents:
641
diff
changeset
|
137 @@ -4603,7 +4638,10 @@ if [ "$CFG_MNG" = "auto" ]; then |
548
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
138 fi |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
139 # detect mng |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
140 if [ "$CFG_LIBMNG" = "auto" ]; then |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
141 - 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
|
142 + if [ "$XPLATFORM" = "win32-g++" ]; then |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
143 + 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
|
144 + CFG_LIBMNG=system |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
145 + 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
|
146 CFG_LIBMNG=system |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
147 else |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
148 CFG_LIBMNG=qt |
648
c661a75806b6
update version of package qt
Mark Brand <mabrand@mabrand.nl>
parents:
641
diff
changeset
|
149 @@ -4612,7 +4650,10 @@ fi |
548
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
150 |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
151 # detect png |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
152 if [ "$CFG_LIBPNG" = "auto" ]; then |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
153 - 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
|
154 + if [ "$XPLATFORM" = "win32-g++" ]; then |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
155 + 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
|
156 + CFG_LIBPNG=system |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
157 + 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
|
158 CFG_LIBPNG=system |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
159 else |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
160 CFG_LIBPNG=qt |
786
d3d9a4a2843d
revert openssl hacks in configure and use pg_config in package qt
Mark Brand <mabrand@mabrand.nl>
parents:
785
diff
changeset
|
161 @@ -4686,7 +4727,12 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do |
d3d9a4a2843d
revert openssl hacks in configure and use pg_config in package qt
Mark Brand <mabrand@mabrand.nl>
parents:
785
diff
changeset
|
162 fi |
d3d9a4a2843d
revert openssl hacks in configure and use pg_config in package qt
Mark Brand <mabrand@mabrand.nl>
parents:
785
diff
changeset
|
163 [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL" |
d3d9a4a2843d
revert openssl hacks in configure and use pg_config in package qt
Mark Brand <mabrand@mabrand.nl>
parents:
785
diff
changeset
|
164 [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL" |
d3d9a4a2843d
revert openssl hacks in configure and use pg_config in package qt
Mark Brand <mabrand@mabrand.nl>
parents:
785
diff
changeset
|
165 - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/psql "PostgreSQL" $QT_LFLAGS_PSQL $L_FLAGS $QT_CFLAGS_PSQL $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then |
d3d9a4a2843d
revert openssl hacks in configure and use pg_config in package qt
Mark Brand <mabrand@mabrand.nl>
parents:
785
diff
changeset
|
166 + if [ "$XPLATFORM" = "win32-g++" ]; then |
d3d9a4a2843d
revert openssl hacks in configure and use pg_config in package qt
Mark Brand <mabrand@mabrand.nl>
parents:
785
diff
changeset
|
167 + echo "Skipping test for PSQL in cross build for win32-g++" |
d3d9a4a2843d
revert openssl hacks in configure and use pg_config in package qt
Mark Brand <mabrand@mabrand.nl>
parents:
785
diff
changeset
|
168 + if [ "$CFG_SQL_psql" = "auto" ]; then |
d3d9a4a2843d
revert openssl hacks in configure and use pg_config in package qt
Mark Brand <mabrand@mabrand.nl>
parents:
785
diff
changeset
|
169 + CFG_SQL_psql=plugin |
d3d9a4a2843d
revert openssl hacks in configure and use pg_config in package qt
Mark Brand <mabrand@mabrand.nl>
parents:
785
diff
changeset
|
170 + fi |
d3d9a4a2843d
revert openssl hacks in configure and use pg_config in package qt
Mark Brand <mabrand@mabrand.nl>
parents:
785
diff
changeset
|
171 + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/psql "PostgreSQL" $QT_LFLAGS_PSQL $L_FLAGS $QT_CFLAGS_PSQL $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then |
d3d9a4a2843d
revert openssl hacks in configure and use pg_config in package qt
Mark Brand <mabrand@mabrand.nl>
parents:
785
diff
changeset
|
172 if [ "$CFG_SQL_psql" = "auto" ]; then |
d3d9a4a2843d
revert openssl hacks in configure and use pg_config in package qt
Mark Brand <mabrand@mabrand.nl>
parents:
785
diff
changeset
|
173 CFG_SQL_psql=plugin |
d3d9a4a2843d
revert openssl hacks in configure and use pg_config in package qt
Mark Brand <mabrand@mabrand.nl>
parents:
785
diff
changeset
|
174 fi |
d3d9a4a2843d
revert openssl hacks in configure and use pg_config in package qt
Mark Brand <mabrand@mabrand.nl>
parents:
785
diff
changeset
|
175 @@ -4707,7 +4753,10 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do |
520
9294e8fad5e9
add ODBC support to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
509
diff
changeset
|
176 ;; |
9294e8fad5e9
add ODBC support to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
509
diff
changeset
|
177 odbc) |
9294e8fad5e9
add ODBC support to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
509
diff
changeset
|
178 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
|
179 - 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
|
180 + if [ "$XPLATFORM" = "win32-g++" ]; then |
9294e8fad5e9
add ODBC support to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
509
diff
changeset
|
181 + 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
|
182 + CFG_SQL_odbc=plugin |
9294e8fad5e9
add ODBC support to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
509
diff
changeset
|
183 + 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
|
184 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
|
185 CFG_SQL_odbc=plugin |
9294e8fad5e9
add ODBC support to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
509
diff
changeset
|
186 fi |
786
d3d9a4a2843d
revert openssl hacks in configure and use pg_config in package qt
Mark Brand <mabrand@mabrand.nl>
parents:
785
diff
changeset
|
187 @@ -4752,7 +4801,12 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do |
548
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
188 ;; |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
189 tds) |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
190 if [ "$CFG_SQL_tds" != "no" ]; then |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
191 - 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
|
192 + if [ "$XPLATFORM" = "win32-g++" ]; then |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
193 + 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
|
194 + if [ "CFG_SQL_tds" = "auto" ]; then |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
195 + CFG_SQL_tds=plugin |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
196 + fi |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
197 + 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
|
198 if [ "$CFG_SQL_tds" = "auto" ]; then |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
199 CFG_SQL_tds=plugin |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
200 fi |
786
d3d9a4a2843d
revert openssl hacks in configure and use pg_config in package qt
Mark Brand <mabrand@mabrand.nl>
parents:
785
diff
changeset
|
201 @@ -4834,7 +4888,13 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do |
548
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
202 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
|
203 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
|
204 fi |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
205 - 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
|
206 + if [ "$XPLATFORM" = "win32-g++" ]; then |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
207 + 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
|
208 + if [ "$CFG_SQL_sqlite" = "auto" ]; then |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
209 + CFG_SQL_sqlite=plugin |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
210 + fi |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
211 + QMAKE_CONFIG="$QMAKE_CONFIG system-sqlite" |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
212 + 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
|
213 if [ "$CFG_SQL_sqlite" = "auto" ]; then |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
214 CFG_SQL_sqlite=plugin |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
215 fi |
786
d3d9a4a2843d
revert openssl hacks in configure and use pg_config in package qt
Mark Brand <mabrand@mabrand.nl>
parents:
785
diff
changeset
|
216 @@ -4905,7 +4965,9 @@ fi |
548
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
217 |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
218 # auto-detect iconv(3) support |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
219 if [ "$CFG_ICONV" != "no" ]; then |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
220 - if [ "$PLATFORM_QWS" = "yes" ]; then |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
221 + if [ "$XPLATFORM" = "win32-g++" ]; then |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
222 + CFG_ICONV=no |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
223 + elif [ "$PLATFORM_QWS" = "yes" ]; then |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
224 CFG_ICONV=no |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
225 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
|
226 CFG_ICONV=yes |
786
d3d9a4a2843d
revert openssl hacks in configure and use pg_config in package qt
Mark Brand <mabrand@mabrand.nl>
parents:
785
diff
changeset
|
227 @@ -5065,7 +5127,9 @@ if [ "$PLATFORM_X11" = "yes" ]; then |
452
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
228 echo "Basic XLib functionality test failed!" |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
229 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
|
230 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
|
231 - exit 1 |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
232 +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
|
233 +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
|
234 +# exit 1 |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
235 fi |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
236 |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
237 # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x) |
786
d3d9a4a2843d
revert openssl hacks in configure and use pg_config in package qt
Mark Brand <mabrand@mabrand.nl>
parents:
785
diff
changeset
|
238 @@ -5139,7 +5203,9 @@ if [ "$PLATFORM_X11" = "yes" ]; then |
470
a07d9f69e2ee
add OpenGL support to package qt (by Martin Lambers)
Volker Grabsch <vog@notjusthosting.com>
parents:
469
diff
changeset
|
239 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
|
240 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
|
241 echo " ${XQMAKESPEC}." |
a07d9f69e2ee
add OpenGL support to package qt (by Martin Lambers)
Volker Grabsch <vog@notjusthosting.com>
parents:
469
diff
changeset
|
242 - exit 1 |
a07d9f69e2ee
add OpenGL support to package qt (by Martin Lambers)
Volker Grabsch <vog@notjusthosting.com>
parents:
469
diff
changeset
|
243 +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
|
244 +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
|
245 +# exit 1 |
a07d9f69e2ee
add OpenGL support to package qt (by Martin Lambers)
Volker Grabsch <vog@notjusthosting.com>
parents:
469
diff
changeset
|
246 fi |
a07d9f69e2ee
add OpenGL support to package qt (by Martin Lambers)
Volker Grabsch <vog@notjusthosting.com>
parents:
469
diff
changeset
|
247 case "$PLATFORM" in |
a07d9f69e2ee
add OpenGL support to package qt (by Martin Lambers)
Volker Grabsch <vog@notjusthosting.com>
parents:
469
diff
changeset
|
248 hpux*) |
786
d3d9a4a2843d
revert openssl hacks in configure and use pg_config in package qt
Mark Brand <mabrand@mabrand.nl>
parents:
785
diff
changeset
|
249 @@ -5640,7 +5706,10 @@ if [ "$CFG_DOUBLEFORMAT" = "auto" ]; then |
548
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
250 fi |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
251 |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
252 HAVE_STL=no |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
253 -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
|
254 +if [ "$XPLATFORM" = "win32-g++" ]; then |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
255 + 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
|
256 + HAVE_STL=yes |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
257 +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
|
258 HAVE_STL=yes |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
259 fi |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
260 |
786
d3d9a4a2843d
revert openssl hacks in configure and use pg_config in package qt
Mark Brand <mabrand@mabrand.nl>
parents:
785
diff
changeset
|
261 @@ -5662,7 +5731,10 @@ fi |
548
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
262 |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
263 # find if the platform supports IPv6 |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
264 if [ "$CFG_IPV6" != "no" ]; then |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
265 - 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
|
266 + if [ "$XPLATFORM" = "win32-g++" ]; then |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
267 + 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
|
268 + CFG_IPV6=yes |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
269 + 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
|
270 CFG_IPV6=yes |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
271 else |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
272 if [ "$CFG_IPV6" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then |
786
d3d9a4a2843d
revert openssl hacks in configure and use pg_config in package qt
Mark Brand <mabrand@mabrand.nl>
parents:
785
diff
changeset
|
273 @@ -5776,7 +5848,10 @@ fi |
573
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
274 |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
275 # find if the platform supports X/Open Large File compilation environment |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
276 if [ "$CFG_LARGEFILE" != "no" ]; then |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
277 - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/largefile "X/Open Large File" $L_FLAGS $I_FLAGS $l_FLAGS; then |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
278 + if [ "$XPLATFORM" = "win32-g++" ]; then |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
279 + echo "Using LARGEFILE for win32-g++ target" |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
280 + CFG_LARGEFILE=yes |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
281 + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/largefile "X/Open Large File" $L_FLAGS $I_FLAGS $l_FLAGS; then |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
282 CFG_LARGEFILE=yes |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
283 else |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
284 if [ "$CFG_LARGEFILE" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then |
786
d3d9a4a2843d
revert openssl hacks in configure and use pg_config in package qt
Mark Brand <mabrand@mabrand.nl>
parents:
785
diff
changeset
|
285 @@ -5793,7 +5868,9 @@ fi |
548
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
286 |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
287 # detect OpenSSL |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
288 if [ "$CFG_OPENSSL" != "no" ]; then |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
289 - 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
|
290 + if [ "$XPLATFORM" = "win32-g++" ]; then |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
291 + 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
|
292 + 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
|
293 if [ "$CFG_OPENSSL" = "auto" ]; then |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
294 CFG_OPENSSL=yes |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
295 fi |
786
d3d9a4a2843d
revert openssl hacks in configure and use pg_config in package qt
Mark Brand <mabrand@mabrand.nl>
parents:
785
diff
changeset
|
296 @@ -6141,6 +6218,7 @@ fi |
524
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
297 [ "$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
|
298 [ "$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
|
299 [ "$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
|
300 +[ "$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
|
301 [ "$CFG_IWMMXT" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG iwmmxt" |
648
c661a75806b6
update version of package qt
Mark Brand <mabrand@mabrand.nl>
parents:
641
diff
changeset
|
302 [ "$CFG_NEON" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG neon" |
524
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
303 [ "$PLATFORM_MAC" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG $CFG_MAC_ARCHS" |
786
d3d9a4a2843d
revert openssl hacks in configure and use pg_config in package qt
Mark Brand <mabrand@mabrand.nl>
parents:
785
diff
changeset
|
304 @@ -6222,11 +6300,12 @@ else |
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
|
305 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
|
306 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
|
307 |
1503cb754dde
disable a disturbing build mechanism which is unnecessary when cross compiling in package qt
Volker Grabsch <vog@notjusthosting.com>
parents:
482
diff
changeset
|
308 -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
|
309 - #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
|
310 - #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
|
311 - [ "$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
|
312 -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
|
313 +# 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
|
314 +#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
|
315 +# #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
|
316 +# #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
|
317 +# [ "$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
|
318 +#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
|
319 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
|
320 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
|
321 elif [ "$CFG_ZLIB" = "system" ]; then |
786
d3d9a4a2843d
revert openssl hacks in configure and use pg_config in package qt
Mark Brand <mabrand@mabrand.nl>
parents:
785
diff
changeset
|
322 @@ -7161,7 +7240,7 @@ fi |
524
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
323 |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
324 cat >>"$QTCONFIG.tmp" <<EOF |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
325 #configuration |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
326 -CONFIG += $QTCONFIG_CONFIG |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
327 +CONFIG += $QMAKE_CONFIG $QTCONFIG_CONFIG |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
328 QT_ARCH = $CFG_ARCH |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
329 QT_EDITION = $Edition |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
330 QT_CONFIG += $QT_CONFIG |
786
d3d9a4a2843d
revert openssl hacks in configure and use pg_config in package qt
Mark Brand <mabrand@mabrand.nl>
parents:
785
diff
changeset
|
331 @@ -7434,7 +7513,7 @@ fi |
564
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
332 echo "Declarative module .. $CFG_DECLARATIVE" |
524
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
333 echo "STL support ......... $CFG_STL" |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
334 echo "PCH support ......... $CFG_PRECOMPILE" |
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
335 -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
|
336 +echo "MMX/3DNOW/SSE/SSE2/RTTI.. ${CFG_MMX}/${CFG_3DNOW}/${CFG_SSE}/${CFG_SSE2}/${CFG_RTTI}" |
648
c661a75806b6
update version of package qt
Mark Brand <mabrand@mabrand.nl>
parents:
641
diff
changeset
|
337 if [ "$CFG_ARCH" = "arm" ] || [ "$CFG_ARCH" = "armv6" ]; then |
524
28e14850b092
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
520
diff
changeset
|
338 echo "iWMMXt support ...... ${CFG_IWMMXT}" |
648
c661a75806b6
update version of package qt
Mark Brand <mabrand@mabrand.nl>
parents:
641
diff
changeset
|
339 echo "NEON support ........ ${CFG_NEON}" |
786
d3d9a4a2843d
revert openssl hacks in configure and use pg_config in package qt
Mark Brand <mabrand@mabrand.nl>
parents:
785
diff
changeset
|
340 @@ -7752,7 +7831,11 @@ for file in .projects .projects.3; do |
452
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
341 [ "$IN_ROOT" = "no" ] && continue |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
342 |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
343 case $a in |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
344 - *winmain/winmain.pro) continue ;; |
482
d2e34271758b
cleanup in the win32 patch of package qt
Volker Grabsch <vog@notjusthosting.com>
parents:
479
diff
changeset
|
345 + *winmain/winmain.pro) |
d2e34271758b
cleanup in the win32 patch of package qt
Volker Grabsch <vog@notjusthosting.com>
parents:
479
diff
changeset
|
346 + case "$XPLATFORM" in |
d2e34271758b
cleanup in the win32 patch of package qt
Volker Grabsch <vog@notjusthosting.com>
parents:
479
diff
changeset
|
347 + win32*) SPEC=$XQMAKESPEC ;; |
d2e34271758b
cleanup in the win32 patch of package qt
Volker Grabsch <vog@notjusthosting.com>
parents:
479
diff
changeset
|
348 + *) continue ;; |
d2e34271758b
cleanup in the win32 patch of package qt
Volker Grabsch <vog@notjusthosting.com>
parents:
479
diff
changeset
|
349 + esac ;; |
452
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
350 *s60main/s60main.pro) continue ;; |
564
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
351 *examples/activeqt/*) continue ;; |
452
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
352 */qmake/qmake.pro) continue ;; |
597
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
353 diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
354 index b282f69..fb65805 100644 |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
355 --- a/mkspecs/win32-g++/qmake.conf |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
356 +++ b/mkspecs/win32-g++/qmake.conf |
548
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
357 @@ -3,23 +3,31 @@ |
452
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
358 # |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
359 # Written for MinGW |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
360 # |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
361 +load(qt_config) |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
362 |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
363 MAKEFILE_GENERATOR = MINGW |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
364 TEMPLATE = app |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
365 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
|
366 +CONFIG += windows win32 |
452
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
367 +CONFIG -= freetype |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
368 +QT_CONFIG -= freetype |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
369 QT += core gui |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
370 DEFINES += UNICODE QT_LARGEFILE_SUPPORT |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
371 +DEFINES -= QT_LARGEFILE_SUPPORT |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
372 +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
|
373 QMAKE_COMPILER_DEFINES += __GNUC__ WIN32 |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
374 |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
375 QMAKE_EXT_OBJ = .o |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
376 QMAKE_EXT_RES = _res.o |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
377 |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
378 -QMAKE_CC = gcc |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
379 +QMAKE_CC = HOSTPLATFORMPREFIX-gcc |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
380 QMAKE_LEX = flex |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
381 QMAKE_LEXFLAGS = |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
382 QMAKE_YACC = byacc |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
383 QMAKE_YACCFLAGS = -d |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
384 QMAKE_CFLAGS = |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
385 +QMAKE_CFLAGS += -isystem HOSTPLATFORMINCLUDE |
548
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
386 +QMAKE_CFLAGS += -pipe |
452
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
387 QMAKE_CFLAGS_DEPS = -M |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
388 QMAKE_CFLAGS_WARN_ON = -Wall |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
389 QMAKE_CFLAGS_WARN_OFF = -w |
597
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
390 @@ -27,7 +35,7 @@ QMAKE_CFLAGS_RELEASE = -O2 |
452
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
391 QMAKE_CFLAGS_DEBUG = -g |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
392 QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
393 |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
394 -QMAKE_CXX = g++ |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
395 +QMAKE_CXX = HOSTPLATFORMPREFIX-g++ |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
396 QMAKE_CXXFLAGS = $$QMAKE_CFLAGS |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
397 QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
398 QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON |
597
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
399 @@ -42,6 +50,7 @@ QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions -mthreads |
452
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
400 QMAKE_CXXFLAGS_EXCEPTIONS_OFF = -fno-exceptions |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
401 |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
402 QMAKE_INCDIR = |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
403 +QMAKE_INCDIR += . |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
404 QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
405 QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
406 |
597
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
407 @@ -50,8 +59,8 @@ QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< |
452
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
408 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
|
409 QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
410 |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
411 -QMAKE_LINK = g++ |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
412 -QMAKE_LINK_C = gcc |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
413 +QMAKE_LINK = HOSTPLATFORMPREFIX-g++ |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
414 +QMAKE_LINK_C = HOSTPLATFORMPREFIX-gcc |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
415 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
|
416 QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads -Wl |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
417 QMAKE_LFLAGS_EXCEPTIONS_OFF = |
597
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
418 @@ -72,15 +81,18 @@ QMAKE_LIBS_OPENGL = -lopengl32 -lglu32 -lgdi32 -luser32 |
452
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
419 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
|
420 QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
421 |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
422 +QMAKE_SH = bash |
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 !isEmpty(QMAKE_SH) { |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
425 MINGW_IN_SHELL = 1 |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
426 QMAKE_DIR_SEP = / |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
427 QMAKE_COPY = cp |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
428 - QMAKE_COPY_DIR = xcopy /s /q /y /i |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
429 + QMAKE_COPY_DIR = cp -r |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
430 QMAKE_MOVE = mv |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
431 QMAKE_DEL_FILE = rm |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
432 - QMAKE_MKDIR = mkdir |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
433 + QMAKE_MKDIR = mkdir -p |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
434 QMAKE_DEL_DIR = rmdir |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
435 + QMAKE_SYMBOLIC_LINK = ln -s |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
436 QMAKE_CHK_DIR_EXISTS = test -d |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
437 } else { |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
438 QMAKE_COPY = copy /y |
597
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
439 @@ -92,15 +104,16 @@ QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain |
452
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
440 QMAKE_CHK_DIR_EXISTS = if not exist |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
441 } |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
442 |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
443 -QMAKE_MOC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}moc.exe |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
444 -QMAKE_UIC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}uic.exe |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
445 -QMAKE_IDC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}idc.exe |
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
|
446 +#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
|
447 +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
|
448 +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
|
449 +QMAKE_UIC = HOSTPLATFORMPREFIX-uic |
597
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
450 |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
451 -QMAKE_IDL = midl |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
452 -QMAKE_LIB = ar -ru |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
453 -QMAKE_RC = windres |
452
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
454 +#QMAKE_IDL = midl |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
455 +QMAKE_LIB = HOSTPLATFORMPREFIX-ar -ru |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
456 +QMAKE_RC = HOSTPLATFORMPREFIX-windres |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
457 QMAKE_ZIP = zip -r -9 |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
458 |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
459 -QMAKE_STRIP = strip |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
460 +QMAKE_STRIP = HOSTPLATFORMPREFIX-strip |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
461 QMAKE_STRIPFLAGS_LIB += --strip-unneeded |
ade2c475c772
new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
462 -load(qt_config) |
548
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
463 +PKG_CONFIG = HOSTPLATFORMPREFIX-pkg-config |
597
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
464 diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
465 index 3406e41..e171584 100644 |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
466 --- a/src/corelib/tools/tools.pri |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
467 +++ b/src/corelib/tools/tools.pri |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
468 @@ -96,8 +96,8 @@ contains(QT_CONFIG, zlib) { |
573
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
469 ../3rdparty/zlib/uncompr.c \ |
564
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
470 ../3rdparty/zlib/zutil.c |
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
471 } else:!contains(QT_CONFIG, no-zlib) { |
573
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
472 - unix:LIBS_PRIVATE += -lz |
564
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
473 -# win32:LIBS += libz.lib |
573
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
474 + unix|win32-g++:LIBS_PRIVATE += -lz |
578
41c0ac9326f2
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
576
diff
changeset
|
475 + win32:!win32-g++:LIBS += zdll.lib |
509
e97947e7d45e
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
491
diff
changeset
|
476 } |
564
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
477 |
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
478 DEFINES += HB_EXPORT=Q_CORE_EXPORT |
597
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
479 diff --git a/src/gui/image/image.pri b/src/gui/image/image.pri |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
480 index b67be55..6642ae3 100644 |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
481 --- a/src/gui/image/image.pri |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
482 +++ b/src/gui/image/image.pri |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
483 @@ -93,11 +93,11 @@ SOURCES += \ |
573
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
484 SOURCES += image/qpnghandler.cpp |
509
e97947e7d45e
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
491
diff
changeset
|
485 |
564
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
486 contains(QT_CONFIG, system-png) { |
573
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
487 - unix:LIBS_PRIVATE += -lpng |
564
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
488 - win32:LIBS += libpng.lib |
578
41c0ac9326f2
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
576
diff
changeset
|
489 + unix|win32-g++:LIBS_PRIVATE += -lpng |
41c0ac9326f2
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
576
diff
changeset
|
490 + win32:!win32-g++:LIBS += libpng.lib |
564
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
491 } else { |
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
492 !isEqual(QT_ARCH, i386):!isEqual(QT_ARCH, x86_64):DEFINES += PNG_NO_ASSEMBLER_CODE |
573
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
493 - INCLUDEPATH += ../3rdparty/libpng ../3rdparty/zlib |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
494 + INCLUDEPATH += ../3rdparty/libpng |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
495 SOURCES += ../3rdparty/libpng/png.c \ |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
496 ../3rdparty/libpng/pngerror.c \ |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
497 ../3rdparty/libpng/pngget.c \ |
597
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
498 @@ -115,6 +115,10 @@ SOURCES += \ |
573
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
499 ../3rdparty/libpng/pngwutil.c \ |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
500 ../3rdparty/libpng/pnggccrd.c |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
501 } |
578
41c0ac9326f2
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
576
diff
changeset
|
502 + contains(QT_CONFIG, system-zlib) { |
41c0ac9326f2
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
576
diff
changeset
|
503 + unix|win32-g++:LIBS_PRIVATE += -lz |
41c0ac9326f2
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
576
diff
changeset
|
504 + win32:!win32-g++:LIBS += zdll.lib |
41c0ac9326f2
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
576
diff
changeset
|
505 + } |
573
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
506 } else { |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
507 DEFINES *= QT_NO_IMAGEFORMAT_PNG |
578
41c0ac9326f2
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
576
diff
changeset
|
508 } |
597
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
509 diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri |
648
c661a75806b6
update version of package qt
Mark Brand <mabrand@mabrand.nl>
parents:
641
diff
changeset
|
510 index a6cc9c7..95779a1 100644 |
597
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
511 --- a/src/gui/painting/painting.pri |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
512 +++ b/src/gui/painting/painting.pri |
648
c661a75806b6
update version of package qt
Mark Brand <mabrand@mabrand.nl>
parents:
641
diff
changeset
|
513 @@ -387,9 +387,9 @@ neon { |
573
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
514 } |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
515 |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
516 contains(QT_CONFIG, zlib) { |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
517 - INCLUDEPATH += ../3rdparty/zlib |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
518 + INCLUDEPATH += ../3rdparty/zlib |
564
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
519 } else:!contains(QT_CONFIG, no-zlib) { |
573
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
520 - unix:LIBS_PRIVATE += -lz |
564
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
521 -# win32:LIBS += libz.lib |
573
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
522 + unix|win32-g++:LIBS_PRIVATE += -lz |
578
41c0ac9326f2
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
576
diff
changeset
|
523 + win32:!win32-g++:LIBS += zdll.lib |
573
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
524 } |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
525 |
597
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
526 diff --git a/src/network/access/access.pri b/src/network/access/access.pri |
648
c661a75806b6
update version of package qt
Mark Brand <mabrand@mabrand.nl>
parents:
641
diff
changeset
|
527 index aa36890..f009761 100644 |
597
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
528 --- a/src/network/access/access.pri |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
529 +++ b/src/network/access/access.pri |
648
c661a75806b6
update version of package qt
Mark Brand <mabrand@mabrand.nl>
parents:
641
diff
changeset
|
530 @@ -59,8 +59,8 @@ SOURCES += access/qftp.cpp \ |
573
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
531 |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
532 #zlib support |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
533 contains(QT_CONFIG, zlib) { |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
534 - INCLUDEPATH += ../3rdparty/zlib |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
535 + INCLUDEPATH += ../3rdparty/zlib |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
536 } else:!contains(QT_CONFIG, no-zlib) { |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
537 - unix:LIBS_PRIVATE += -lz |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
538 -# win32:LIBS += libz.lib |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
539 + unix|win32-g++:LIBS_PRIVATE += -lz |
578
41c0ac9326f2
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
576
diff
changeset
|
540 + win32:!win32-g++:LIBS += zdll.lib |
573
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
541 } |
597
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
542 diff --git a/src/plugins/imageformats/jpeg/jpeg.pro b/src/plugins/imageformats/jpeg/jpeg.pro |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
543 index ebc79cc..30a19c6 100644 |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
544 --- a/src/plugins/imageformats/jpeg/jpeg.pro |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
545 +++ b/src/plugins/imageformats/jpeg/jpeg.pro |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
546 @@ -20,8 +20,8 @@ symbian: { |
564
c67df741dfa7
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
548
diff
changeset
|
547 } |
509
e97947e7d45e
update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
491
diff
changeset
|
548 |
573
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
549 contains(QT_CONFIG, system-jpeg) { |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
550 - unix:LIBS += -ljpeg |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
551 - win32:LIBS += libjpeg.lib |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
552 + unix|win32-g++:LIBS += -ljpeg |
578
41c0ac9326f2
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
576
diff
changeset
|
553 + win32:!win32-g++:LIBS += libjpeg.lib |
573
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
554 } |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
555 !contains(QT_CONFIG, system-jpeg) { |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
556 INCLUDEPATH += ../../../3rdparty/libjpeg |
597
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
557 diff --git a/src/plugins/imageformats/mng/mng.pro b/src/plugins/imageformats/mng/mng.pro |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
558 index de7dfa7..46c84c4 100644 |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
559 --- a/src/plugins/imageformats/mng/mng.pro |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
560 +++ b/src/plugins/imageformats/mng/mng.pro |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
561 @@ -14,8 +14,8 @@ symbian: { |
573
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
562 } |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
563 |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
564 contains(QT_CONFIG, system-mng) { |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
565 - unix:LIBS += -lmng |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
566 - win32:LIBS += libmng.lib |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
567 + unix|win32-g++:LIBS += -lmng |
578
41c0ac9326f2
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
576
diff
changeset
|
568 + win32:!win32-g++:LIBS += libmng.lib |
41c0ac9326f2
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
576
diff
changeset
|
569 } |
41c0ac9326f2
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
576
diff
changeset
|
570 !contains(QT_CONFIG, system-mng) { |
573
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
571 DEFINES += MNG_BUILD_SO |
597
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
572 @@ -44,10 +44,11 @@ contains(QT_CONFIG, system-mng) { |
573
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
573 } |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
574 |
578
41c0ac9326f2
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
576
diff
changeset
|
575 contains(QT_CONFIG, system-zlib) { |
573
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
576 - LIBS += -lz |
578
41c0ac9326f2
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
576
diff
changeset
|
577 + unix|win32-g++:LIBS_PRIVATE += -lz |
41c0ac9326f2
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
576
diff
changeset
|
578 + win32:!win32-g++:LIBS += zdll.lib |
576
d262f9cc5821
some more improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
574
diff
changeset
|
579 } |
578
41c0ac9326f2
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
576
diff
changeset
|
580 !contains(QT_CONFIG, system-zlib) { |
573
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
581 - INCLUDEPATH += ../../../3rdparty/zlib |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
582 + INCLUDEPATH += ../../../3rdparty/zlib |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
583 } |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
584 |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
585 QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/imageformats |
597
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
586 diff --git a/src/plugins/imageformats/tiff/tiff.pro b/src/plugins/imageformats/tiff/tiff.pro |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
587 index 312f99c..29d36f4 100644 |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
588 --- a/src/plugins/imageformats/tiff/tiff.pro |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
589 +++ b/src/plugins/imageformats/tiff/tiff.pro |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
590 @@ -8,8 +8,13 @@ SOURCES += main.cpp \ |
573
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
591 qtiffhandler.cpp |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
592 |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
593 contains(QT_CONFIG, system-tiff) { |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
594 - unix:LIBS += -ltiff |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
595 - win32:LIBS += libtiff.lib |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
596 + unix|win32-g++:LIBS += -ltiff |
578
41c0ac9326f2
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
576
diff
changeset
|
597 + win32:!win32-g++:LIBS += libtiff.lib |
41c0ac9326f2
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
576
diff
changeset
|
598 + |
41c0ac9326f2
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
576
diff
changeset
|
599 + contains(QT_CONFIG, system-jpeg) { |
41c0ac9326f2
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
576
diff
changeset
|
600 + unix|win32-g++:LIBS += -ljpeg |
41c0ac9326f2
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
576
diff
changeset
|
601 + win32:!win32-g++:LIBS += libjpeg.lib |
41c0ac9326f2
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
576
diff
changeset
|
602 + } |
41c0ac9326f2
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
576
diff
changeset
|
603 } |
41c0ac9326f2
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
576
diff
changeset
|
604 !contains(QT_CONFIG, system-tiff) { |
573
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
605 INCLUDEPATH += ../../../3rdparty/libtiff/libtiff |
597
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
606 @@ -62,10 +67,11 @@ contains(QT_CONFIG, system-tiff) { |
573
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
607 } |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
608 |
578
41c0ac9326f2
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
576
diff
changeset
|
609 contains(QT_CONFIG, system-zlib) { |
573
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
610 - LIBS += -lz |
578
41c0ac9326f2
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
576
diff
changeset
|
611 + unix|win32-g++:LIBS_PRIVATE += -lz |
41c0ac9326f2
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
576
diff
changeset
|
612 + win32:!win32-g++:LIBS += zdll.lib |
576
d262f9cc5821
some more improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
574
diff
changeset
|
613 } |
578
41c0ac9326f2
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
576
diff
changeset
|
614 !contains(QT_CONFIG, system-zlib) { |
573
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
615 - INCLUDEPATH += ../../../3rdparty/zlib |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
616 + INCLUDEPATH += ../../../3rdparty/zlib |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
617 } |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
618 |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
619 QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/imageformats |
597
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
620 diff --git a/src/plugins/sqldrivers/psql/psql.pro b/src/plugins/sqldrivers/psql/psql.pro |
648
c661a75806b6
update version of package qt
Mark Brand <mabrand@mabrand.nl>
parents:
641
diff
changeset
|
621 index 29fbada..0a38ee4 100644 |
597
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
622 --- a/src/plugins/sqldrivers/psql/psql.pro |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
623 +++ b/src/plugins/sqldrivers/psql/psql.pro |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
624 @@ -4,18 +4,15 @@ HEADERS = ../../../sql/drivers/psql/qsql_psql.h |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
625 SOURCES = main.cpp \ |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
626 ../../../sql/drivers/psql/qsql_psql.cpp |
584
407cf0b9f8fc
add missing "-lsecur32" to the PostgreSQL support of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
578
diff
changeset
|
627 |
597
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
628 -unix: { |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
629 +unix|win32-g++: { |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
630 !isEmpty(QT_LFLAGS_PSQL) { |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
631 - LIBS *= $$QT_LFLAGS_PSQL |
648
c661a75806b6
update version of package qt
Mark Brand <mabrand@mabrand.nl>
parents:
641
diff
changeset
|
632 + !contains(QT_CONFIG, system-zlib): QT_LFLAGS_PSQL -= -lz |
597
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
633 + !static:LIBS *= $$QT_LFLAGS_PSQL |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
634 QMAKE_CXXFLAGS *= $$QT_CFLAGS_PSQL |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
635 } |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
636 !contains(LIBS, .*pq.*):LIBS *= -lpq |
584
407cf0b9f8fc
add missing "-lsecur32" to the PostgreSQL support of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
578
diff
changeset
|
637 } |
407cf0b9f8fc
add missing "-lsecur32" to the PostgreSQL support of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
578
diff
changeset
|
638 |
597
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
639 -win32:!contains(LIBS, .*pq.* ) { |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
640 - !win32-g++:LIBS *= -llibpq |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
641 - win32-g++:LIBS *= -lpq |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
642 - LIBS *= -lws2_32 -ladvapi32 |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
643 -} |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
644 +win32:!win32-g++:!contains(LIBS, .*pq.* ) LIBS *= -llibpq -lws2_32 -ladvapi32 |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
645 |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
646 include(../qsqldriverbase.pri) |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
647 diff --git a/src/plugins/sqldrivers/tds/main.cpp b/src/plugins/sqldrivers/tds/main.cpp |
757 | 648 index eb654ef..0a17f17 100644 |
597
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
649 --- a/src/plugins/sqldrivers/tds/main.cpp |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
650 +++ b/src/plugins/sqldrivers/tds/main.cpp |
548
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
651 @@ -47,6 +47,7 @@ |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
652 #define _WINSCARD_H_ |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
653 #include <windows.h> |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
654 #endif |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
655 +#define Q_USE_SYBASE |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
656 #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
|
657 |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
658 QT_BEGIN_NAMESPACE |
597
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
659 diff --git a/src/plugins/sqldrivers/tds/tds.pro b/src/plugins/sqldrivers/tds/tds.pro |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
660 index 08a166b..f66d5b7 100644 |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
661 --- a/src/plugins/sqldrivers/tds/tds.pro |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
662 +++ b/src/plugins/sqldrivers/tds/tds.pro |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
663 @@ -6,8 +6,9 @@ SOURCES = main.cpp \ |
548
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
664 ../../../sql/drivers/tds/qsql_tds.cpp |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
665 |
578
41c0ac9326f2
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
576
diff
changeset
|
666 unix:!contains( LIBS, .*sybdb.* ):LIBS *= -lsybdb |
41c0ac9326f2
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
576
diff
changeset
|
667 +win32-g++:LIBS *= -lsybdb -liconv -lws2_32 |
41c0ac9326f2
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
576
diff
changeset
|
668 |
548
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
669 -win32 { |
578
41c0ac9326f2
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
576
diff
changeset
|
670 +win32:!win32-g++ { |
41c0ac9326f2
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
576
diff
changeset
|
671 !win32-borland:LIBS *= -lNTWDBLIB |
41c0ac9326f2
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
576
diff
changeset
|
672 win32-borland:LIBS *= $(BCB)/lib/PSDK/NTWDBLIB.LIB |
41c0ac9326f2
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
576
diff
changeset
|
673 } |
597
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
674 diff --git a/src/qbase.pri b/src/qbase.pri |
757 | 675 index 710a2b6..2c3e91c 100644 |
597
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
676 --- a/src/qbase.pri |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
677 +++ b/src/qbase.pri |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
678 @@ -85,7 +85,6 @@ win32-borland { |
573
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
679 } |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
680 |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
681 win32 { |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
682 - CONFIG += zlib |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
683 INCLUDEPATH += tmp |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
684 !static: DEFINES+=QT_MAKEDLL |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
685 } |
597
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
686 diff --git a/src/sql/drivers/drivers.pri b/src/sql/drivers/drivers.pri |
648
c661a75806b6
update version of package qt
Mark Brand <mabrand@mabrand.nl>
parents:
641
diff
changeset
|
687 index 184eca9..aac0267 100644 |
597
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
688 --- a/src/sql/drivers/drivers.pri |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
689 +++ b/src/sql/drivers/drivers.pri |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
690 @@ -6,19 +6,16 @@ contains(sql-drivers, psql) { |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
691 HEADERS += drivers/psql/qsql_psql.h |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
692 SOURCES += drivers/psql/qsql_psql.cpp |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
693 |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
694 - unix { |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
695 - !isEmpty(QT_LFLAGS_PSQL) { |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
696 - LIBS *= $$QT_LFLAGS_PSQL |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
697 + unix|win32-g++ { |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
698 + !static:!isEmpty(QT_LFLAGS_PSQL) { |
648
c661a75806b6
update version of package qt
Mark Brand <mabrand@mabrand.nl>
parents:
641
diff
changeset
|
699 + !contains(QT_CONFIG, system-zlib): QT_LFLAGS_PSQL -= -lz |
597
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
700 + !static:LIBS *= $$QT_LFLAGS_PSQL |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
701 QMAKE_CXXFLAGS *= $$QT_CFLAGS_PSQL |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
702 } |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
703 !contains(LIBS, .*pq.*):LIBS *= -lpq |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
704 } |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
705 |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
706 - win32 { |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
707 - !win32-g++:!contains( LIBS, .*pq.* ):LIBS *= -llibpq |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
708 - win32-g++:!contains( LIBS, .*pq.* ):LIBS *= -lpq |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
709 - LIBS *= -lws2_32 -ladvapi32 |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
710 - } |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
711 + win32:!win32-g++:!contains(LIBS, .*pq.* ) LIBS *= -llibpq -lws2_32 -ladvapi32 |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
712 } |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
713 |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
714 contains(sql-drivers, mysql) { |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
715 diff --git a/src/sql/drivers/tds/qsql_tds.cpp b/src/sql/drivers/tds/qsql_tds.cpp |
757 | 716 index 422f866..16785ed 100644 |
597
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
717 --- a/src/sql/drivers/tds/qsql_tds.cpp |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
718 +++ b/src/sql/drivers/tds/qsql_tds.cpp |
548
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
719 @@ -47,7 +47,8 @@ |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
720 #else |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
721 #define Q_USE_SYBASE |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
722 #endif |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
723 - |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
724 +//Force SYBASE because we use FreeTDS |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
725 +#define Q_USE_SYBASE |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
726 #include "qsql_tds.h" |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
727 |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
728 #include <qvariant.h> |
597
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
729 diff --git a/src/sql/drivers/tds/qsql_tds.h b/src/sql/drivers/tds/qsql_tds.h |
757 | 730 index cb318f3..a6354ce 100644 |
597
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
731 --- a/src/sql/drivers/tds/qsql_tds.h |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
732 +++ b/src/sql/drivers/tds/qsql_tds.h |
548
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
733 @@ -48,7 +48,8 @@ |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
734 |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
735 #ifdef Q_OS_WIN32 |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
736 #define WIN32_LEAN_AND_MEAN |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
737 -#define DBNTWIN32 // indicates 32bit windows dblib |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
738 +//#define DBNTWIN32 // indicates 32bit windows dblib |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
739 +#include <winsock2.h> |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
740 #include <QtCore/qt_windows.h> |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
741 #include <sqlfront.h> |
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
742 #include <sqldb.h> |
597
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
743 diff --git a/src/svg/svg.pro b/src/svg/svg.pro |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
744 index d2a4227..0d3ef83 100644 |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
745 --- a/src/svg/svg.pro |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
746 +++ b/src/svg/svg.pro |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
747 @@ -44,7 +44,8 @@ symbian:TARGET.UID3=0x2001B2E2 |
573
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
748 |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
749 #zlib support |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
750 contains(QT_CONFIG, zlib) { |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
751 - INCLUDEPATH += ../3rdparty/zlib |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
752 + INCLUDEPATH += ../3rdparty/zlib |
548
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
753 } else:!contains(QT_CONFIG, no-zlib) { |
573
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
754 - unix:LIBS_PRIVATE += -lz |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
755 + unix|win32-g++:LIBS_PRIVATE += -lz |
578
41c0ac9326f2
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
576
diff
changeset
|
756 + win32:!win32-g++:LIBS += zdll.lib |
573
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
757 } |
597
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
758 diff --git a/src/tools/bootstrap/bootstrap.pri b/src/tools/bootstrap/bootstrap.pri |
648
c661a75806b6
update version of package qt
Mark Brand <mabrand@mabrand.nl>
parents:
641
diff
changeset
|
759 index b3ee948..18efe9d 100644 |
597
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
760 --- a/src/tools/bootstrap/bootstrap.pri |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
761 +++ b/src/tools/bootstrap/bootstrap.pri |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
762 @@ -52,8 +52,8 @@ hpux-acc*|hpuxi-acc* { |
573
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
763 LIBS += -lbootstrap |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
764 } |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
765 !contains(QT_CONFIG, zlib):!contains(QT_CONFIG, no-zlib) { |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
766 - unix:LIBS += -lz |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
767 -# win32:LIBS += libz.lib |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
768 + unix|win32-g++:LIBS_PRIVATE += -lz |
578
41c0ac9326f2
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
576
diff
changeset
|
769 + win32:!win32-g++:LIBS += zdll.lib |
573
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
770 } |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
771 win32:LIBS += -luser32 |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
772 |
597
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
773 diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro |
648
c661a75806b6
update version of package qt
Mark Brand <mabrand@mabrand.nl>
parents:
641
diff
changeset
|
774 index 0dbb90f..e6b43a6 100644 |
597
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
775 --- a/src/tools/bootstrap/bootstrap.pro |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
776 +++ b/src/tools/bootstrap/bootstrap.pro |
648
c661a75806b6
update version of package qt
Mark Brand <mabrand@mabrand.nl>
parents:
641
diff
changeset
|
777 @@ -109,6 +109,9 @@ contains(QT_CONFIG, zlib) { |
573
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
778 ../3rdparty/zlib/trees.c \ |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
779 ../3rdparty/zlib/uncompr.c \ |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
780 ../3rdparty/zlib/zutil.c |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
781 +} else:!contains(QT_CONFIG, no-zlib) { |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
782 + unix|win32-g++:LIBS_PRIVATE += -lz |
578
41c0ac9326f2
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
576
diff
changeset
|
783 + win32:!win32-g++:LIBS += zdll.lib |
548
08b6c299a522
several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
524
diff
changeset
|
784 } |
573
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
785 |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
786 lib.CONFIG = dummy_install |
597
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
787 diff --git a/src/winmain/winmain.pro b/src/winmain/winmain.pro |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
788 index bc322b9..f1fec05 100644 |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
789 --- a/src/winmain/winmain.pro |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
790 +++ b/src/winmain/winmain.pro |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
791 @@ -11,7 +11,7 @@ win32 { |
573
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
792 win32-g++:DEFINES += QT_NEEDS_QMAIN |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
793 win32-borland:DEFINES += QT_NEEDS_QMAIN |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
794 SOURCES = qtmain_win.cpp |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
795 - CONFIG += png zlib |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
796 + CONFIG += png |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
797 CONFIG -= jpeg |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
798 INCLUDEPATH += tmp $$QMAKE_INCDIR_QT/QtCore |
57166e6490d2
use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
564
diff
changeset
|
799 } |
597
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
800 diff --git a/tools/qvfb/qvfb.pro b/tools/qvfb/qvfb.pro |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
801 index dde7e8d..556dbcb 100644 |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
802 --- a/tools/qvfb/qvfb.pro |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
803 +++ b/tools/qvfb/qvfb.pro |
e3fe50a527d3
revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
591
diff
changeset
|
804 @@ -42,12 +42,14 @@ contains(QT_CONFIG, opengl) { |
576
d262f9cc5821
some more improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
574
diff
changeset
|
805 } |
d262f9cc5821
some more improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
574
diff
changeset
|
806 |
578
41c0ac9326f2
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
576
diff
changeset
|
807 contains(QT_CONFIG, system-png) { |
41c0ac9326f2
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
576
diff
changeset
|
808 - LIBS += -lpng |
41c0ac9326f2
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
576
diff
changeset
|
809 + unix|win32-g++:LIBS_PRIVATE += -lpng |
41c0ac9326f2
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
576
diff
changeset
|
810 + win32:!win32-g++:LIBS += libpng.lib |
41c0ac9326f2
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
576
diff
changeset
|
811 } else { |
41c0ac9326f2
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
576
diff
changeset
|
812 INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/libpng |
576
d262f9cc5821
some more improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
574
diff
changeset
|
813 } |
578
41c0ac9326f2
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
576
diff
changeset
|
814 contains(QT_CONFIG, system-zlib) { |
41c0ac9326f2
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
576
diff
changeset
|
815 - LIBS += -lz |
41c0ac9326f2
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
576
diff
changeset
|
816 + unix|win32-g++:LIBS_PRIVATE += -lz |
41c0ac9326f2
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
576
diff
changeset
|
817 + win32:!win32-g++:LIBS += zdll.lib |
41c0ac9326f2
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
576
diff
changeset
|
818 } else { |
41c0ac9326f2
improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
576
diff
changeset
|
819 INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/zlib |
576
d262f9cc5821
some more improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
574
diff
changeset
|
820 } |