Mercurial > mxe-octave

annotate src/qt-win32.patch @ 648:c661a75806b6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update version of package qt
author Mark Brand <mabrand@mabrand.nl>
date Thu, 21 Jan 2010 02:02:05 +0100
parents dab071eac9c0
children 29f1ba4559ae
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
641
dab071eac9c0 simplified file markers
Volker Grabsch <vog@notjusthosting.com>
parents: 597
diff changeset
1 This file is part of mingw-cross-env.
dab071eac9c0 simplified file markers
Volker Grabsch <vog@notjusthosting.com>
parents: 597
diff changeset
2 See doc/index.html or doc/README for further information.
452
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
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
648
c661a75806b6 update version of package qt
Mark Brand <mabrand@mabrand.nl>
parents: 641
diff changeset
5 index 033f415..becf8ea 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
648
c661a75806b6 update version of package qt
Mark Brand <mabrand@mabrand.nl>
parents: 641
diff changeset
161 @@ -4679,7 +4720,11 @@ 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
162 fi
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
163 ;;
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
164 psql)
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
165 - if [ "$CFG_SQL_psql" != "no" ]; then
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
166 + if [ "$XPLATFORM" = "win32-g++" ]; then
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
167 + echo "We cannot test for PostgreSQL support since we are cross building for win32-g++, so we assume it is there."
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
168 + CFG_SQL_psql=plugin
597
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
169 + QT_LFLAGS_PSQL="-lpq -lsecur32 `$PKG_CONFIG --libs openssl`"
548
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
170 + elif [ "$CFG_SQL_psql" != "no" ]; then
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
171 if "$WHICH" pg_config >/dev/null 2>&1; then
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
172 QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null`
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
173 QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null`
648
c661a75806b6 update version of package qt
Mark Brand <mabrand@mabrand.nl>
parents: 641
diff changeset
174 @@ -4707,7 +4752,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
175 ;;
9294e8fad5e9 add ODBC support to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 509
diff changeset
176 odbc)
9294e8fad5e9 add ODBC support to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 509
diff changeset
177 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
178 - 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
179 + if [ "$XPLATFORM" = "win32-g++" ]; then
9294e8fad5e9 add ODBC support to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 509
diff changeset
180 + 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
181 + CFG_SQL_odbc=plugin
9294e8fad5e9 add ODBC support to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 509
diff changeset
182 + 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
183 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
184 CFG_SQL_odbc=plugin
9294e8fad5e9 add ODBC support to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 509
diff changeset
185 fi
648
c661a75806b6 update version of package qt
Mark Brand <mabrand@mabrand.nl>
parents: 641
diff changeset
186 @@ -4752,7 +4800,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
187 ;;
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
188 tds)
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
189 if [ "$CFG_SQL_tds" != "no" ]; then
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
190 - 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
191 + if [ "$XPLATFORM" = "win32-g++" ]; then
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
192 + 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
193 + if [ "CFG_SQL_tds" = "auto" ]; then
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
194 + CFG_SQL_tds=plugin
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
195 + fi
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
196 + 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
197 if [ "$CFG_SQL_tds" = "auto" ]; then
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
198 CFG_SQL_tds=plugin
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
199 fi
648
c661a75806b6 update version of package qt
Mark Brand <mabrand@mabrand.nl>
parents: 641
diff changeset
200 @@ -4834,7 +4887,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
201 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
202 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
203 fi
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
204 - 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
205 + if [ "$XPLATFORM" = "win32-g++" ]; then
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
206 + 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
207 + if [ "$CFG_SQL_sqlite" = "auto" ]; then
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
208 + CFG_SQL_sqlite=plugin
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
209 + fi
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
210 + QMAKE_CONFIG="$QMAKE_CONFIG system-sqlite"
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
211 + 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
212 if [ "$CFG_SQL_sqlite" = "auto" ]; then
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
213 CFG_SQL_sqlite=plugin
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
214 fi
648
c661a75806b6 update version of package qt
Mark Brand <mabrand@mabrand.nl>
parents: 641
diff changeset
215 @@ -4905,7 +4964,9 @@ fi
548
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
216
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
217 # auto-detect iconv(3) support
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
218 if [ "$CFG_ICONV" != "no" ]; then
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
219 - if [ "$PLATFORM_QWS" = "yes" ]; then
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
220 + if [ "$XPLATFORM" = "win32-g++" ]; then
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
221 + CFG_ICONV=no
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
222 + elif [ "$PLATFORM_QWS" = "yes" ]; then
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
223 CFG_ICONV=no
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
224 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
225 CFG_ICONV=yes
648
c661a75806b6 update version of package qt
Mark Brand <mabrand@mabrand.nl>
parents: 641
diff changeset
226 @@ -5065,7 +5126,9 @@ if [ "$PLATFORM_X11" = "yes" ]; then
452
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
227 echo "Basic XLib functionality test failed!"
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
228 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
229 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
230 - exit 1
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
231 +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
232 +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
233 +# exit 1
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
234 fi
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
235
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
236 # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x)
648
c661a75806b6 update version of package qt
Mark Brand <mabrand@mabrand.nl>
parents: 641
diff changeset
237 @@ -5139,7 +5202,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
238 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
239 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
240 echo " ${XQMAKESPEC}."
a07d9f69e2ee add OpenGL support to package qt (by Martin Lambers)
Volker Grabsch <vog@notjusthosting.com>
parents: 469
diff changeset
241 - exit 1
a07d9f69e2ee add OpenGL support to package qt (by Martin Lambers)
Volker Grabsch <vog@notjusthosting.com>
parents: 469
diff changeset
242 +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
243 +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
244 +# exit 1
a07d9f69e2ee add OpenGL support to package qt (by Martin Lambers)
Volker Grabsch <vog@notjusthosting.com>
parents: 469
diff changeset
245 fi
a07d9f69e2ee add OpenGL support to package qt (by Martin Lambers)
Volker Grabsch <vog@notjusthosting.com>
parents: 469
diff changeset
246 case "$PLATFORM" in
a07d9f69e2ee add OpenGL support to package qt (by Martin Lambers)
Volker Grabsch <vog@notjusthosting.com>
parents: 469
diff changeset
247 hpux*)
648
c661a75806b6 update version of package qt
Mark Brand <mabrand@mabrand.nl>
parents: 641
diff changeset
248 @@ -5640,7 +5705,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
249 fi
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
250
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
251 HAVE_STL=no
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
252 -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
253 +if [ "$XPLATFORM" = "win32-g++" ]; then
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
254 + 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
255 + HAVE_STL=yes
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
256 +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
257 HAVE_STL=yes
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
258 fi
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
259
648
c661a75806b6 update version of package qt
Mark Brand <mabrand@mabrand.nl>
parents: 641
diff changeset
260 @@ -5662,7 +5730,10 @@ fi
548
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
261
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
262 # find if the platform supports IPv6
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
263 if [ "$CFG_IPV6" != "no" ]; then
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
264 - 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
265 + if [ "$XPLATFORM" = "win32-g++" ]; then
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
266 + 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
267 + CFG_IPV6=yes
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
268 + 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
269 CFG_IPV6=yes
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
270 else
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
271 if [ "$CFG_IPV6" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
648
c661a75806b6 update version of package qt
Mark Brand <mabrand@mabrand.nl>
parents: 641
diff changeset
272 @@ -5776,7 +5847,10 @@ fi
573
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
273
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
274 # 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
275 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
276 - 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
277 + 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
278 + 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
279 + CFG_LARGEFILE=yes
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
280 + 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
281 CFG_LARGEFILE=yes
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
282 else
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
283 if [ "$CFG_LARGEFILE" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
648
c661a75806b6 update version of package qt
Mark Brand <mabrand@mabrand.nl>
parents: 641
diff changeset
284 @@ -5793,7 +5867,9 @@ fi
548
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
285
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
286 # detect OpenSSL
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
287 if [ "$CFG_OPENSSL" != "no" ]; then
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
288 - 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
289 + if [ "$XPLATFORM" = "win32-g++" ]; then
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
290 + 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
291 + 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
292 if [ "$CFG_OPENSSL" = "auto" ]; then
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
293 CFG_OPENSSL=yes
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
294 fi
648
c661a75806b6 update version of package qt
Mark Brand <mabrand@mabrand.nl>
parents: 641
diff changeset
295 @@ -6141,6 +6217,7 @@ fi
524
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
296 [ "$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
297 [ "$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
298 [ "$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
299 +[ "$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
300 [ "$CFG_IWMMXT" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG iwmmxt"
648
c661a75806b6 update version of package qt
Mark Brand <mabrand@mabrand.nl>
parents: 641
diff changeset
301 [ "$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
302 [ "$PLATFORM_MAC" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG $CFG_MAC_ARCHS"
648
c661a75806b6 update version of package qt
Mark Brand <mabrand@mabrand.nl>
parents: 641
diff changeset
303 @@ -6222,11 +6299,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
304 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
305 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
306
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 -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
308 - #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
309 - #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
310 - [ "$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
311 -fi
1503cb754dde disable a disturbing build mechanism which is unnecessary when cross compiling in package qt
Volker Grabsch <vog@notjusthosting.com>
parents: 482
diff changeset
312 +# 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
313 +#if [ "x$PLATFORM_MAC" = "xyes" ]; then
1503cb754dde disable a disturbing build mechanism which is unnecessary when cross compiling in package qt
Volker Grabsch <vog@notjusthosting.com>
parents: 482
diff changeset
314 +# #On Mac we implicitly link against libz, so we
1503cb754dde disable a disturbing build mechanism which is unnecessary when cross compiling in package qt
Volker Grabsch <vog@notjusthosting.com>
parents: 482
diff changeset
315 +# #never use the 3rdparty stuff.
1503cb754dde disable a disturbing build mechanism which is unnecessary when cross compiling in package qt
Volker Grabsch <vog@notjusthosting.com>
parents: 482
diff changeset
316 +# [ "$CFG_ZLIB" = "yes" ] && CFG_ZLIB="system"
1503cb754dde disable a disturbing build mechanism which is unnecessary when cross compiling in package qt
Volker Grabsch <vog@notjusthosting.com>
parents: 482
diff changeset
317 +#fi
1503cb754dde disable a disturbing build mechanism which is unnecessary when cross compiling in package qt
Volker Grabsch <vog@notjusthosting.com>
parents: 482
diff changeset
318 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
319 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
320 elif [ "$CFG_ZLIB" = "system" ]; then
648
c661a75806b6 update version of package qt
Mark Brand <mabrand@mabrand.nl>
parents: 641
diff changeset
321 @@ -7161,7 +7239,7 @@ fi
524
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
322
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
323 cat >>"$QTCONFIG.tmp" <<EOF
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
324 #configuration
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
325 -CONFIG += $QTCONFIG_CONFIG
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
326 +CONFIG += $QMAKE_CONFIG $QTCONFIG_CONFIG
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
327 QT_ARCH = $CFG_ARCH
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
328 QT_EDITION = $Edition
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
329 QT_CONFIG += $QT_CONFIG
648
c661a75806b6 update version of package qt
Mark Brand <mabrand@mabrand.nl>
parents: 641
diff changeset
330 @@ -7253,7 +7331,7 @@ fi
548
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
331 if [ '!' -z "$OPENSSL_LIBS" ]; then
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
332 echo "OPENSSL_LIBS = $OPENSSL_LIBS" >> "$CACHEFILE.tmp"
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
333 elif [ "$CFG_OPENSSL" = "linked" ]; then
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
334 - echo "OPENSSL_LIBS = -lssl -lcrypto" >> "$CACHEFILE.tmp"
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
335 + echo "OPENSSL_LIBS = `$PKG_CONFIG --libs openssl`" >> "$CACHEFILE.tmp"
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
336 fi
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
337
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
338 #dump in the SDK info
648
c661a75806b6 update version of package qt
Mark Brand <mabrand@mabrand.nl>
parents: 641
diff changeset
339 @@ -7434,7 +7512,7 @@ fi
564
c67df741dfa7 update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 548
diff changeset
340 echo "Declarative module .. $CFG_DECLARATIVE"
524
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
341 echo "STL support ......... $CFG_STL"
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
342 echo "PCH support ......... $CFG_PRECOMPILE"
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
343 -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
344 +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
345 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
346 echo "iWMMXt support ...... ${CFG_IWMMXT}"
648
c661a75806b6 update version of package qt
Mark Brand <mabrand@mabrand.nl>
parents: 641
diff changeset
347 echo "NEON support ........ ${CFG_NEON}"
c661a75806b6 update version of package qt
Mark Brand <mabrand@mabrand.nl>
parents: 641
diff changeset
348 @@ -7752,7 +7830,11 @@ for file in .projects .projects.3; do
452
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
349 [ "$IN_ROOT" = "no" ] && continue
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
350
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
351 case $a in
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
352 - *winmain/winmain.pro) continue ;;
482
d2e34271758b cleanup in the win32 patch of package qt
Volker Grabsch <vog@notjusthosting.com>
parents: 479
diff changeset
353 + *winmain/winmain.pro)
d2e34271758b cleanup in the win32 patch of package qt
Volker Grabsch <vog@notjusthosting.com>
parents: 479
diff changeset
354 + case "$XPLATFORM" in
d2e34271758b cleanup in the win32 patch of package qt
Volker Grabsch <vog@notjusthosting.com>
parents: 479
diff changeset
355 + win32*) SPEC=$XQMAKESPEC ;;
d2e34271758b cleanup in the win32 patch of package qt
Volker Grabsch <vog@notjusthosting.com>
parents: 479
diff changeset
356 + *) continue ;;
d2e34271758b cleanup in the win32 patch of package qt
Volker Grabsch <vog@notjusthosting.com>
parents: 479
diff changeset
357 + esac ;;
452
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
358 *s60main/s60main.pro) continue ;;
564
c67df741dfa7 update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 548
diff changeset
359 *examples/activeqt/*) continue ;;
452
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
360 */qmake/qmake.pro) continue ;;
597
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
361 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
362 index b282f69..fb65805 100644
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
363 --- 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
364 +++ 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
365 @@ -3,23 +3,31 @@
452
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
366 #
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
367 # Written for MinGW
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
368 #
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
369 +load(qt_config)
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
370
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
371 MAKEFILE_GENERATOR = MINGW
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
372 TEMPLATE = app
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
373 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
374 +CONFIG += windows win32
452
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
375 +CONFIG -= freetype
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
376 +QT_CONFIG -= freetype
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
377 QT += core gui
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
378 DEFINES += UNICODE QT_LARGEFILE_SUPPORT
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
379 +DEFINES -= QT_LARGEFILE_SUPPORT
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
380 +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
381 QMAKE_COMPILER_DEFINES += __GNUC__ WIN32
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
382
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
383 QMAKE_EXT_OBJ = .o
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
384 QMAKE_EXT_RES = _res.o
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
385
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
386 -QMAKE_CC = gcc
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
387 +QMAKE_CC = HOSTPLATFORMPREFIX-gcc
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
388 QMAKE_LEX = flex
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
389 QMAKE_LEXFLAGS =
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
390 QMAKE_YACC = byacc
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
391 QMAKE_YACCFLAGS = -d
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
392 QMAKE_CFLAGS =
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
393 +QMAKE_CFLAGS += -isystem HOSTPLATFORMINCLUDE
548
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
394 +QMAKE_CFLAGS += -pipe
452
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
395 QMAKE_CFLAGS_DEPS = -M
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
396 QMAKE_CFLAGS_WARN_ON = -Wall
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
397 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
398 @@ -27,7 +35,7 @@ QMAKE_CFLAGS_RELEASE = -O2
452
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
399 QMAKE_CFLAGS_DEBUG = -g
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
400 QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses
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_CXX = g++
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
403 +QMAKE_CXX = HOSTPLATFORMPREFIX-g++
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
404 QMAKE_CXXFLAGS = $$QMAKE_CFLAGS
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
405 QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
406 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
407 @@ -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
408 QMAKE_CXXFLAGS_EXCEPTIONS_OFF = -fno-exceptions
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
409
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
410 QMAKE_INCDIR =
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
411 +QMAKE_INCDIR += .
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
412 QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS]
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
413 QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS]
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
414
597
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
415 @@ -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
416 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
417 QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
418
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
419 -QMAKE_LINK = g++
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
420 -QMAKE_LINK_C = gcc
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
421 +QMAKE_LINK = HOSTPLATFORMPREFIX-g++
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
422 +QMAKE_LINK_C = HOSTPLATFORMPREFIX-gcc
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
423 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
424 QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads -Wl
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
425 QMAKE_LFLAGS_EXCEPTIONS_OFF =
597
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
426 @@ -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
427 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
428 QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
429
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
430 +QMAKE_SH = bash
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
431 +
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
432 !isEmpty(QMAKE_SH) {
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
433 MINGW_IN_SHELL = 1
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
434 QMAKE_DIR_SEP = /
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
435 QMAKE_COPY = cp
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
436 - QMAKE_COPY_DIR = xcopy /s /q /y /i
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
437 + QMAKE_COPY_DIR = cp -r
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
438 QMAKE_MOVE = mv
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
439 QMAKE_DEL_FILE = rm
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
440 - QMAKE_MKDIR = mkdir
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
441 + QMAKE_MKDIR = mkdir -p
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
442 QMAKE_DEL_DIR = rmdir
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
443 + QMAKE_SYMBOLIC_LINK = ln -s
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
444 QMAKE_CHK_DIR_EXISTS = test -d
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
445 } else {
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
446 QMAKE_COPY = copy /y
597
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
447 @@ -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
448 QMAKE_CHK_DIR_EXISTS = if not exist
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
449 }
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
450
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
451 -QMAKE_MOC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}moc.exe
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
452 -QMAKE_UIC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}uic.exe
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
453 -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
454 +#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
455 +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
456 +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
457 +QMAKE_UIC = HOSTPLATFORMPREFIX-uic
597
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
458
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
459 -QMAKE_IDL = midl
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
460 -QMAKE_LIB = ar -ru
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
461 -QMAKE_RC = windres
452
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
462 +#QMAKE_IDL = midl
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
463 +QMAKE_LIB = HOSTPLATFORMPREFIX-ar -ru
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
464 +QMAKE_RC = HOSTPLATFORMPREFIX-windres
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
465 QMAKE_ZIP = zip -r -9
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
466
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
467 -QMAKE_STRIP = strip
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
468 +QMAKE_STRIP = HOSTPLATFORMPREFIX-strip
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
469 QMAKE_STRIPFLAGS_LIB += --strip-unneeded
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
470 -load(qt_config)
548
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
471 +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
472 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
473 index 3406e41..e171584 100644
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
474 --- 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
475 +++ 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
476 @@ -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
477 ../3rdparty/zlib/uncompr.c \
564
c67df741dfa7 update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 548
diff changeset
478 ../3rdparty/zlib/zutil.c
c67df741dfa7 update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 548
diff changeset
479 } 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
480 - unix:LIBS_PRIVATE += -lz
564
c67df741dfa7 update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 548
diff changeset
481 -# 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
482 + unix|win32-g++:LIBS_PRIVATE += -lz
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
483 + 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
484 }
564
c67df741dfa7 update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 548
diff changeset
485
c67df741dfa7 update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 548
diff changeset
486 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
487 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
488 index b67be55..6642ae3 100644
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
489 --- 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
490 +++ 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
491 @@ -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
492 SOURCES += image/qpnghandler.cpp
509
e97947e7d45e update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 491
diff changeset
493
564
c67df741dfa7 update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 548
diff changeset
494 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
495 - unix:LIBS_PRIVATE += -lpng
564
c67df741dfa7 update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 548
diff changeset
496 - win32:LIBS += libpng.lib
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
497 + unix|win32-g++:LIBS_PRIVATE += -lpng
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
498 + 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
499 } else {
c67df741dfa7 update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 548
diff changeset
500 !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
501 - 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
502 + INCLUDEPATH += ../3rdparty/libpng
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
503 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
504 ../3rdparty/libpng/pngerror.c \
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
505 ../3rdparty/libpng/pngget.c \
597
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
506 @@ -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
507 ../3rdparty/libpng/pngwutil.c \
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
508 ../3rdparty/libpng/pnggccrd.c
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
509 }
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
510 + contains(QT_CONFIG, system-zlib) {
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
511 + unix|win32-g++:LIBS_PRIVATE += -lz
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
512 + win32:!win32-g++:LIBS += zdll.lib
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
513 + }
573
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
514 } else {
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
515 DEFINES *= QT_NO_IMAGEFORMAT_PNG
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
516 }
597
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
517 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
518 index a6cc9c7..95779a1 100644
597
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
519 --- 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
520 +++ b/src/gui/painting/painting.pri
648
c661a75806b6 update version of package qt
Mark Brand <mabrand@mabrand.nl>
parents: 641
diff changeset
521 @@ -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
522 }
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
523
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
524 contains(QT_CONFIG, zlib) {
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
525 - INCLUDEPATH += ../3rdparty/zlib
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
526 + INCLUDEPATH += ../3rdparty/zlib
564
c67df741dfa7 update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 548
diff changeset
527 } 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
528 - unix:LIBS_PRIVATE += -lz
564
c67df741dfa7 update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 548
diff changeset
529 -# 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
530 + unix|win32-g++:LIBS_PRIVATE += -lz
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
531 + 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
532 }
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
533
597
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
534 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
535 index aa36890..f009761 100644
597
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
536 --- 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
537 +++ b/src/network/access/access.pri
648
c661a75806b6 update version of package qt
Mark Brand <mabrand@mabrand.nl>
parents: 641
diff changeset
538 @@ -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
539
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
540 #zlib support
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
541 contains(QT_CONFIG, zlib) {
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
542 - INCLUDEPATH += ../3rdparty/zlib
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
543 + INCLUDEPATH += ../3rdparty/zlib
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
544 } 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
545 - unix:LIBS_PRIVATE += -lz
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
546 -# win32:LIBS += libz.lib
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
547 + unix|win32-g++:LIBS_PRIVATE += -lz
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
548 + 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
549 }
597
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
550 diff --git a/src/network/ssl/ssl.pri b/src/network/ssl/ssl.pri
648
c661a75806b6 update version of package qt
Mark Brand <mabrand@mabrand.nl>
parents: 641
diff changeset
551 index 72ea80f..899aa30 100644
597
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
552 --- a/src/network/ssl/ssl.pri
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
553 +++ b/src/network/ssl/ssl.pri
648
c661a75806b6 update version of package qt
Mark Brand <mabrand@mabrand.nl>
parents: 641
diff changeset
554 @@ -35,5 +35,11 @@ symbian {
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
555 RESOURCES += network.qrc
576
d262f9cc5821 some more improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 574
diff changeset
556
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
557 # Add optional SSL libs
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
558 + !contains(QT_CONFIG, system-zlib):contains(OPENSSL_LIBS, -lz) {
648
c661a75806b6 update version of package qt
Mark Brand <mabrand@mabrand.nl>
parents: 641
diff changeset
559 + # Use the zlib in QtCore
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
560 + OPENSSL_LIBS -= -lz
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
561 + OPENSSL_LIBS += -lQtCore4
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
562 + }
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
563 LIBS_PRIVATE += $$OPENSSL_LIBS
576
d262f9cc5821 some more improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 574
diff changeset
564 +
574
bdd31b51843e various improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 573
diff changeset
565 }
597
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
566 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
567 index ebc79cc..30a19c6 100644
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
568 --- 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
569 +++ 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
570 @@ -20,8 +20,8 @@ symbian: {
564
c67df741dfa7 update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 548
diff changeset
571 }
509
e97947e7d45e update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 491
diff changeset
572
573
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
573 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
574 - unix:LIBS += -ljpeg
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
575 - win32:LIBS += libjpeg.lib
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
576 + unix|win32-g++:LIBS += -ljpeg
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
577 + 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
578 }
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
579 !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
580 INCLUDEPATH += ../../../3rdparty/libjpeg
597
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
581 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
582 index de7dfa7..46c84c4 100644
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
583 --- 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
584 +++ 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
585 @@ -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
586 }
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
587
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
588 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
589 - unix:LIBS += -lmng
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
590 - win32:LIBS += libmng.lib
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
591 + unix|win32-g++:LIBS += -lmng
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
592 + win32:!win32-g++:LIBS += libmng.lib
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
593 }
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
594 !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
595 DEFINES += MNG_BUILD_SO
597
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
596 @@ -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
597 }
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
598
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
599 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
600 - LIBS += -lz
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
601 + unix|win32-g++:LIBS_PRIVATE += -lz
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
602 + 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
603 }
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
604 !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
605 - INCLUDEPATH += ../../../3rdparty/zlib
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
606 + INCLUDEPATH += ../../../3rdparty/zlib
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
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
609 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
610 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
611 index 312f99c..29d36f4 100644
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
612 --- 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
613 +++ 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
614 @@ -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
615 qtiffhandler.cpp
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
616
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
617 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
618 - unix:LIBS += -ltiff
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
619 - win32:LIBS += libtiff.lib
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
620 + unix|win32-g++:LIBS += -ltiff
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
621 + win32:!win32-g++:LIBS += libtiff.lib
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
622 +
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
623 + contains(QT_CONFIG, system-jpeg) {
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
624 + unix|win32-g++:LIBS += -ljpeg
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
625 + win32:!win32-g++:LIBS += libjpeg.lib
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
626 + }
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
627 }
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
628 !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
629 INCLUDEPATH += ../../../3rdparty/libtiff/libtiff
597
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
630 @@ -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
631 }
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
632
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
633 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
634 - LIBS += -lz
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
635 + unix|win32-g++:LIBS_PRIVATE += -lz
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
636 + 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
637 }
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
638 !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
639 - INCLUDEPATH += ../../../3rdparty/zlib
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
640 + INCLUDEPATH += ../../../3rdparty/zlib
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
641 }
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
642
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
643 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
644 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
645 index 29fbada..0a38ee4 100644
597
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
646 --- 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
647 +++ 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
648 @@ -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
649 SOURCES = main.cpp \
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
650 ../../../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
651
597
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
652 -unix: {
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
653 +unix|win32-g++: {
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
654 !isEmpty(QT_LFLAGS_PSQL) {
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
655 - LIBS *= $$QT_LFLAGS_PSQL
648
c661a75806b6 update version of package qt
Mark Brand <mabrand@mabrand.nl>
parents: 641
diff changeset
656 + !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
657 + !static:LIBS *= $$QT_LFLAGS_PSQL
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
658 QMAKE_CXXFLAGS *= $$QT_CFLAGS_PSQL
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
659 }
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
660 !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
661 }
407cf0b9f8fc add missing "-lsecur32" to the PostgreSQL support of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 578
diff changeset
662
597
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
663 -win32:!contains(LIBS, .*pq.* ) {
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
664 - !win32-g++:LIBS *= -llibpq
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
665 - win32-g++:LIBS *= -lpq
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
666 - LIBS *= -lws2_32 -ladvapi32
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
667 -}
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
668 +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
669
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
670 include(../qsqldriverbase.pri)
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
671 diff --git a/src/plugins/sqldrivers/tds/main.cpp b/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
672 index 33c1d78..e5af5a6 100644
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
673 --- 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
674 +++ 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
675 @@ -47,6 +47,7 @@
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
676 #define _WINSCARD_H_
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
677 #include <windows.h>
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
678 #endif
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
679 +#define Q_USE_SYBASE
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
680 #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
681
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
682 QT_BEGIN_NAMESPACE
597
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
683 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
684 index 08a166b..f66d5b7 100644
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
685 --- 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
686 +++ 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
687 @@ -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
688 ../../../sql/drivers/tds/qsql_tds.cpp
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
689
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
690 unix:!contains( LIBS, .*sybdb.* ):LIBS *= -lsybdb
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
691 +win32-g++:LIBS *= -lsybdb -liconv -lws2_32
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
692
548
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
693 -win32 {
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
694 +win32:!win32-g++ {
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
695 !win32-borland:LIBS *= -lNTWDBLIB
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
696 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
697 }
597
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
698 diff --git a/src/qbase.pri b/src/qbase.pri
648
c661a75806b6 update version of package qt
Mark Brand <mabrand@mabrand.nl>
parents: 641
diff changeset
699 index d1a2a75..59eeb1b 100644
597
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
700 --- a/src/qbase.pri
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
701 +++ b/src/qbase.pri
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
702 @@ -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
703 }
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
704
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
705 win32 {
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
706 - CONFIG += zlib
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
707 INCLUDEPATH += tmp
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
708 !static: DEFINES+=QT_MAKEDLL
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
709 }
597
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
710 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
711 index 184eca9..aac0267 100644
597
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
712 --- 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
713 +++ 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
714 @@ -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
715 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
716 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
717
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
718 - unix {
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
719 - !isEmpty(QT_LFLAGS_PSQL) {
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
720 - LIBS *= $$QT_LFLAGS_PSQL
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
721 + unix|win32-g++ {
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
722 + !static:!isEmpty(QT_LFLAGS_PSQL) {
648
c661a75806b6 update version of package qt
Mark Brand <mabrand@mabrand.nl>
parents: 641
diff changeset
723 + !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
724 + !static:LIBS *= $$QT_LFLAGS_PSQL
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
725 QMAKE_CXXFLAGS *= $$QT_CFLAGS_PSQL
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
726 }
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
727 !contains(LIBS, .*pq.*):LIBS *= -lpq
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
728 }
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
729
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
730 - win32 {
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
731 - !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
732 - 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
733 - LIBS *= -lws2_32 -ladvapi32
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
734 - }
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
735 + 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
736 }
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
737
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
738 contains(sql-drivers, mysql) {
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
739 diff --git a/src/sql/drivers/tds/qsql_tds.cpp b/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
740 index ab1c283..b3c89d0 100644
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
741 --- 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
742 +++ 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
743 @@ -47,7 +47,8 @@
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
744 #else
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
745 #define Q_USE_SYBASE
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
746 #endif
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
747 -
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
748 +//Force SYBASE because we use FreeTDS
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
749 +#define Q_USE_SYBASE
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
750 #include "qsql_tds.h"
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
751
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
752 #include <qvariant.h>
597
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
753 diff --git a/src/sql/drivers/tds/qsql_tds.h b/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
754 index ab2b808..31c3178 100644
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
755 --- 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
756 +++ 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
757 @@ -48,7 +48,8 @@
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
758
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
759 #ifdef Q_OS_WIN32
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
760 #define WIN32_LEAN_AND_MEAN
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
761 -#define DBNTWIN32 // indicates 32bit windows dblib
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
762 +//#define DBNTWIN32 // indicates 32bit windows dblib
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
763 +#include <winsock2.h>
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
764 #include <QtCore/qt_windows.h>
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
765 #include <sqlfront.h>
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
766 #include <sqldb.h>
597
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
767 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
768 index d2a4227..0d3ef83 100644
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
769 --- a/src/svg/svg.pro
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
770 +++ b/src/svg/svg.pro
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
771 @@ -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
772
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
773 #zlib support
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
774 contains(QT_CONFIG, zlib) {
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
775 - INCLUDEPATH += ../3rdparty/zlib
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
776 + INCLUDEPATH += ../3rdparty/zlib
548
08b6c299a522 several improvements to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 524
diff changeset
777 } 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
778 - unix:LIBS_PRIVATE += -lz
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
779 + unix|win32-g++:LIBS_PRIVATE += -lz
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
780 + 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
781 }
597
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
782 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
783 index b3ee948..18efe9d 100644
597
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
784 --- 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
785 +++ 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
786 @@ -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
787 LIBS += -lbootstrap
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
788 }
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
789 !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
790 - unix:LIBS += -lz
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
791 -# win32:LIBS += libz.lib
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
792 + unix|win32-g++:LIBS_PRIVATE += -lz
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
793 + 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
794 }
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
795 win32:LIBS += -luser32
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
796
597
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
797 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
798 index 0dbb90f..e6b43a6 100644
597
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
799 --- 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
800 +++ b/src/tools/bootstrap/bootstrap.pro
648
c661a75806b6 update version of package qt
Mark Brand <mabrand@mabrand.nl>
parents: 641
diff changeset
801 @@ -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
802 ../3rdparty/zlib/trees.c \
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
803 ../3rdparty/zlib/uncompr.c \
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
804 ../3rdparty/zlib/zutil.c
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
805 +} 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
806 + unix|win32-g++:LIBS_PRIVATE += -lz
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
807 + 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
808 }
573
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
809
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
810 lib.CONFIG = dummy_install
597
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
811 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
812 index bc322b9..f1fec05 100644
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
813 --- a/src/winmain/winmain.pro
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
814 +++ b/src/winmain/winmain.pro
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
815 @@ -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
816 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
817 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
818 SOURCES = qtmain_win.cpp
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
819 - CONFIG += png zlib
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
820 + CONFIG += png
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
821 CONFIG -= jpeg
57166e6490d2 use more external libraries in package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 564
diff changeset
822 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
823 }
597
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
824 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
825 index dde7e8d..556dbcb 100644
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
826 --- a/tools/qvfb/qvfb.pro
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
827 +++ b/tools/qvfb/qvfb.pro
e3fe50a527d3 revised shared qsqlpsql plugin dependency handling for package qt
Mark Brand <mabrand@mabrand.nl>
parents: 591
diff changeset
828 @@ -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
829 }
d262f9cc5821 some more improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 574
diff changeset
830
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
831 contains(QT_CONFIG, system-png) {
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
832 - LIBS += -lpng
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
833 + unix|win32-g++:LIBS_PRIVATE += -lpng
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
834 + win32:!win32-g++:LIBS += libpng.lib
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
835 } else {
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
836 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
837 }
578
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
838 contains(QT_CONFIG, system-zlib) {
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
839 - LIBS += -lz
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
840 + unix|win32-g++:LIBS_PRIVATE += -lz
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
841 + win32:!win32-g++:LIBS += zdll.lib
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
842 } else {
41c0ac9326f2 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 576
diff changeset
843 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
844 }