Mercurial > mxe-octave

annotate src/qt-win32.patch @ 524:28e14850b092

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
improvements for package qt (by Mark Brand) Added support for compiler flag rtti to configure script. This was already supported by the configure binary for Windows. Fixed "detection" of mmx, 3dnow, sse, sse2, and rtti in configure script for win32-g++ target. Fixed failure to add a whole bunch of CONFIG options to qconfig.pri, including but not limited to mmx, 3dnow, sse, sse2. I wonder if this was a bug in the configure script. Now the CONFIG line looks more like the one produced by the configure binary.
author Volker Grabsch <vog@notjusthosting.com>
date Sun, 08 Nov 2009 22:43:41 +0100
parents 9294e8fad5e9
children 08b6c299a522
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
452
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
1 Copyright (C) 2009 Mark Brand
464
0174ea97b91d several bugfixes for package qt to ensure that "i686-pc-mingw32-qmake ; make" will work
Volker Grabsch <vog@notjusthosting.com>
parents: 452
diff changeset
2 Volker Grabsch
470
a07d9f69e2ee add OpenGL support to package qt (by Martin Lambers)
Volker Grabsch <vog@notjusthosting.com>
parents: 469
diff changeset
3 Martin Lambers
452
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
4
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
5 Permission is hereby granted, free of charge, to any person obtaining
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
6 a copy of this software and associated documentation files (the
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
7 "Software"), to deal in the Software without restriction, including
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
8 without limitation the rights to use, copy, modify, merge, publish,
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
9 distribute, sublicense, and/or sell copies of the Software, and to
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
10 permit persons to whom the Software is furnished to do so, subject
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
11 to the following conditions:
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
12
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
13 The above copyright notice and this permission notice shall be
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
14 included in all copies or substantial portions of the Software.
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
15
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
16 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
17 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
18 MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
19 IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
20 CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
21 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
22 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
23
524
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
24 --- qt-everywhere-opensource-src-4.6.0-beta1.native/configure 2009-10-29 14:02:18.000000000 +0100
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
25 +++ qt-everywhere-opensource-src-4.6.0-beta1/configure 2009-10-29 14:00:46.000000000 +0100
452
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
26 @@ -600,7 +600,7 @@
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
27 rm -f "$outpath/config.tests/.qmake.cache"
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
28 cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache"
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
29
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
30 -QMakeVar add styles "cde mac motif plastique cleanlooks windows"
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
31 +QMakeVar add styles "cde mac motif plastique cleanlooks windows windowsxp windowsvista"
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
32 QMakeVar add decorations "default windows styled"
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
33 QMakeVar add mouse-drivers "pc"
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
34 if [ "$UNAME_SYSTEM" = "Linux" ] ; then
524
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
35 @@ -725,6 +725,7 @@
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
36 CFG_3DNOW=auto
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
37 CFG_SSE=auto
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
38 CFG_SSE2=auto
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
39 +CFG_RTTI=auto
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
40 CFG_REDUCE_RELOCATIONS=no
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
41 CFG_IPV6=auto
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
42 CFG_NAS=no
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
43 @@ -4374,7 +4375,10 @@
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
44
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
45 # detect mmx support
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
46 if [ "${CFG_MMX}" = "auto" ]; then
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
47 - 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
48 + if [ "$XPLATFORM" = "win32-g++" ]; then
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
49 + echo "Using MMX for win32-g++ target"
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
50 + CFG_MMX=yes
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
51 + 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
52 CFG_MMX=yes
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
53 else
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
54 CFG_MMX=no
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
55 @@ -4383,7 +4387,10 @@
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
56
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
57 # detect 3dnow support
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
58 if [ "${CFG_3DNOW}" = "auto" ]; then
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
59 - 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
60 + if [ "$XPLATFORM" = "win32-g++" ]; then
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
61 + echo "Using SSE for win32-g++ target"
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
62 + CFG_3DNOW=yes
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
63 + 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
64 CFG_3DNOW=yes
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
65 else
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
66 CFG_3DNOW=no
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
67 @@ -4392,7 +4399,10 @@
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
68
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
69 # detect sse support
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
70 if [ "${CFG_SSE}" = "auto" ]; then
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
71 - 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
72 + if [ "$XPLATFORM" = "win32-g++" ]; then
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
73 + echo "Using SSE for win32-g++ target"
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
74 + CFG_SSE=yes
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
75 + 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
76 CFG_SSE=yes
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
77 else
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
78 CFG_SSE=no
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
79 @@ -4401,13 +4411,26 @@
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
80
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
81 # detect sse2 support
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
82 if [ "${CFG_SSE2}" = "auto" ]; then
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
83 - 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
84 + if [ "$XPLATFORM" = "win32-g++" ]; then
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
85 + echo "Using SSE2 for win32-g++ target"
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
86 + CFG_SSE2=yes
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
87 + 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
88 CFG_SSE2=yes
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
89 else
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
90 CFG_SSE2=no
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
91 fi
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
92 fi
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
93
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
94 +# detect rtti support
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
95 +if [ "${CFG_RTTI}" = "auto" ]; then
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
96 + if [ "$XPLATFORM" = "win32-g++" ]; then
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
97 + echo "Using RTTI for win32-g++ target"
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
98 + CFG_RTTI=yes
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
99 + else
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
100 + CFG_RTTI=no
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
101 + fi
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
102 +fi
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
103 +
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
104 # check iWMMXt support
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
105 if [ "$CFG_IWMMXT" = "yes" ]; then
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
106 "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/iwmmxt "iwmmxt" $L_FLAGS $I_FLAGS $l_FLAGS "-mcpu=iwmmxt"
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
107 @@ -4598,7 +4621,10 @@
520
9294e8fad5e9 add ODBC support to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 509
diff changeset
108 ;;
9294e8fad5e9 add ODBC support to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 509
diff changeset
109 odbc)
9294e8fad5e9 add ODBC support to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 509
diff changeset
110 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
111 - 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
112 + if [ "$XPLATFORM" = "win32-g++" ]; then
9294e8fad5e9 add ODBC support to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 509
diff changeset
113 + 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
114 + CFG_SQL_odbc=plugin
9294e8fad5e9 add ODBC support to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 509
diff changeset
115 + 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
116 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
117 CFG_SQL_odbc=plugin
9294e8fad5e9 add ODBC support to package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 509
diff changeset
118 fi
524
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
119 @@ -4956,7 +4982,9 @@
452
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
120 echo "Basic XLib functionality test failed!"
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
121 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
122 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
123 - exit 1
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
124 +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
125 +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
126 +# exit 1
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
127 fi
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
128
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
129 # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x)
524
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
130 @@ -5030,7 +5058,9 @@
470
a07d9f69e2ee add OpenGL support to package qt (by Martin Lambers)
Volker Grabsch <vog@notjusthosting.com>
parents: 469
diff changeset
131 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
132 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
133 echo " ${XQMAKESPEC}."
a07d9f69e2ee add OpenGL support to package qt (by Martin Lambers)
Volker Grabsch <vog@notjusthosting.com>
parents: 469
diff changeset
134 - exit 1
a07d9f69e2ee add OpenGL support to package qt (by Martin Lambers)
Volker Grabsch <vog@notjusthosting.com>
parents: 469
diff changeset
135 +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
136 +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
137 +# exit 1
a07d9f69e2ee add OpenGL support to package qt (by Martin Lambers)
Volker Grabsch <vog@notjusthosting.com>
parents: 469
diff changeset
138 fi
a07d9f69e2ee add OpenGL support to package qt (by Martin Lambers)
Volker Grabsch <vog@notjusthosting.com>
parents: 469
diff changeset
139 case "$PLATFORM" in
a07d9f69e2ee add OpenGL support to package qt (by Martin Lambers)
Volker Grabsch <vog@notjusthosting.com>
parents: 469
diff changeset
140 hpux*)
524
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
141 @@ -6016,6 +6046,7 @@
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
142 [ "$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
143 [ "$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
144 [ "$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
145 +[ "$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
146 [ "$CFG_IWMMXT" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG iwmmxt"
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
147 [ "$PLATFORM_MAC" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG $CFG_MAC_ARCHS"
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
148 if [ "$CFG_IPV6" = "yes" ]; then
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
149 @@ -6096,11 +6127,12 @@
491
1503cb754dde disable a disturbing build mechanism which is unnecessary when cross compiling in package qt
Volker Grabsch <vog@notjusthosting.com>
parents: 482
diff changeset
150 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
151 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
152
1503cb754dde disable a disturbing build mechanism which is unnecessary when cross compiling in package qt
Volker Grabsch <vog@notjusthosting.com>
parents: 482
diff changeset
153 -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
154 - #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
155 - #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
156 - [ "$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
157 -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
158 +# 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
159 +#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
160 +# #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
161 +# #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
162 +# [ "$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
163 +#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
164 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
165 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
166 elif [ "$CFG_ZLIB" = "system" ]; then
524
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
167 @@ -7025,7 +7057,7 @@
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
168
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
169 cat >>"$QTCONFIG.tmp" <<EOF
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
170 #configuration
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
171 -CONFIG += $QTCONFIG_CONFIG
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
172 +CONFIG += $QMAKE_CONFIG $QTCONFIG_CONFIG
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
173 QT_ARCH = $CFG_ARCH
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
174 QT_EDITION = $Edition
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
175 QT_CONFIG += $QT_CONFIG
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
176 @@ -7297,7 +7329,7 @@
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
177 fi
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
178 echo "STL support ......... $CFG_STL"
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
179 echo "PCH support ......... $CFG_PRECOMPILE"
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
180 -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
181 +echo "MMX/3DNOW/SSE/SSE2/RTTI.. ${CFG_MMX}/${CFG_3DNOW}/${CFG_SSE}/${CFG_SSE2}/${CFG_RTTI}"
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
182 if [ "${CFG_ARCH}" = "arm" ]; then
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
183 echo "iWMMXt support ...... ${CFG_IWMMXT}"
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
184 fi
28e14850b092 improvements for package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 520
diff changeset
185 @@ -7610,7 +7642,11 @@
452
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
186 [ "$IN_ROOT" = "no" ] && continue
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
187
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
188 case $a in
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
189 - *winmain/winmain.pro) continue ;;
482
d2e34271758b cleanup in the win32 patch of package qt
Volker Grabsch <vog@notjusthosting.com>
parents: 479
diff changeset
190 + *winmain/winmain.pro)
d2e34271758b cleanup in the win32 patch of package qt
Volker Grabsch <vog@notjusthosting.com>
parents: 479
diff changeset
191 + case "$XPLATFORM" in
d2e34271758b cleanup in the win32 patch of package qt
Volker Grabsch <vog@notjusthosting.com>
parents: 479
diff changeset
192 + win32*) SPEC=$XQMAKESPEC ;;
d2e34271758b cleanup in the win32 patch of package qt
Volker Grabsch <vog@notjusthosting.com>
parents: 479
diff changeset
193 + *) continue ;;
d2e34271758b cleanup in the win32 patch of package qt
Volker Grabsch <vog@notjusthosting.com>
parents: 479
diff changeset
194 + esac ;;
452
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
195 *s60main/s60main.pro) continue ;;
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
196 */qmake/qmake.pro) continue ;;
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
197 *tools/bootstrap*|*tools/moc*|*tools/rcc*|*tools/uic*) SPEC=$QMAKESPEC ;;
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
198 --- qt-everywhere-opensource-src-4.6.0-tp1.native/mkspecs/win32-g++/qmake.conf 2009-09-07 13:00:28.000000000 +0200
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
199 +++ qt-everywhere-opensource-src-4.6.0-tp1/mkspecs/win32-g++/qmake.conf 2009-10-02 09:57:20.000000000 +0200
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
200 @@ -3,23 +3,30 @@
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
201 #
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
202 # Written for MinGW
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
203 #
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
204 +load(qt_config)
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
205
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
206 MAKEFILE_GENERATOR = MINGW
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
207 TEMPLATE = app
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
208 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
209 +CONFIG += windows win32
452
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
210 +CONFIG -= freetype
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
211 +QT_CONFIG -= freetype
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
212 QT += core gui
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
213 DEFINES += UNICODE QT_LARGEFILE_SUPPORT
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
214 +DEFINES -= QT_LARGEFILE_SUPPORT
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
215 +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
216 QMAKE_COMPILER_DEFINES += __GNUC__ WIN32
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
217
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
218 QMAKE_EXT_OBJ = .o
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
219 QMAKE_EXT_RES = _res.o
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
220
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
221 -QMAKE_CC = gcc
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
222 +QMAKE_CC = HOSTPLATFORMPREFIX-gcc
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
223 QMAKE_LEX = flex
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
224 QMAKE_LEXFLAGS =
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
225 QMAKE_YACC = byacc
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
226 QMAKE_YACCFLAGS = -d
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
227 QMAKE_CFLAGS =
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
228 +QMAKE_CFLAGS += -isystem HOSTPLATFORMINCLUDE
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
229 QMAKE_CFLAGS_DEPS = -M
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
230 QMAKE_CFLAGS_WARN_ON = -Wall
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
231 QMAKE_CFLAGS_WARN_OFF = -w
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
232 @@ -27,7 +34,7 @@
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
233 QMAKE_CFLAGS_DEBUG = -g
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
234 QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses
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 -QMAKE_CXX = g++
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
237 +QMAKE_CXX = HOSTPLATFORMPREFIX-g++
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
238 QMAKE_CXXFLAGS = $$QMAKE_CFLAGS
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
239 QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
240 QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
241 @@ -42,6 +49,7 @@
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
242 QMAKE_CXXFLAGS_EXCEPTIONS_OFF = -fno-exceptions
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
243
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
244 QMAKE_INCDIR =
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
245 +QMAKE_INCDIR += .
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
246 QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS]
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
247 QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS]
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
248
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
249 @@ -50,8 +58,8 @@
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
250 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
251 QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
252
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
253 -QMAKE_LINK = g++
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
254 -QMAKE_LINK_C = gcc
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
255 +QMAKE_LINK = HOSTPLATFORMPREFIX-g++
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
256 +QMAKE_LINK_C = HOSTPLATFORMPREFIX-gcc
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
257 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
258 QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads -Wl
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
259 QMAKE_LFLAGS_EXCEPTIONS_OFF =
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
260 @@ -72,15 +80,18 @@
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
261 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
262 QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
263
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
264 +QMAKE_SH = bash
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
265 +
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
266 !isEmpty(QMAKE_SH) {
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
267 MINGW_IN_SHELL = 1
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
268 QMAKE_DIR_SEP = /
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
269 QMAKE_COPY = cp
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
270 - QMAKE_COPY_DIR = xcopy /s /q /y /i
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
271 + QMAKE_COPY_DIR = cp -r
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
272 QMAKE_MOVE = mv
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
273 QMAKE_DEL_FILE = rm
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
274 - QMAKE_MKDIR = mkdir
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
275 + QMAKE_MKDIR = mkdir -p
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
276 QMAKE_DEL_DIR = rmdir
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
277 + QMAKE_SYMBOLIC_LINK = ln -s
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
278 QMAKE_CHK_DIR_EXISTS = test -d
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
279 } else {
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
280 QMAKE_COPY = copy /y
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
281 @@ -92,15 +103,15 @@
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
282 QMAKE_CHK_DIR_EXISTS = if not exist
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
283 }
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
284
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
285 -QMAKE_MOC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}moc.exe
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
286 -QMAKE_UIC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}uic.exe
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
287 -QMAKE_IDC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}idc.exe
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
288 -
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
289 -QMAKE_IDL = midl
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
290 -QMAKE_LIB = ar -ru
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
291 -QMAKE_RC = windres
464
0174ea97b91d several bugfixes for package qt to ensure that "i686-pc-mingw32-qmake ; make" will work
Volker Grabsch <vog@notjusthosting.com>
parents: 452
diff changeset
292 +#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
293 +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
294 +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
295 +QMAKE_UIC = HOSTPLATFORMPREFIX-uic
452
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
296 +
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
297 +#QMAKE_IDL = midl
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
298 +QMAKE_LIB = HOSTPLATFORMPREFIX-ar -ru
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
299 +QMAKE_RC = HOSTPLATFORMPREFIX-windres
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
300 QMAKE_ZIP = zip -r -9
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
301
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
302 -QMAKE_STRIP = strip
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
303 +QMAKE_STRIP = HOSTPLATFORMPREFIX-strip
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
304 QMAKE_STRIPFLAGS_LIB += --strip-unneeded
ade2c475c772 new package: qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
305 -load(qt_config)
509
e97947e7d45e update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 491
diff changeset
306 --- qt-everywhere-opensource-src-4.6.0-beta1.native/src/3rdparty/webkit/JavaScriptCore/jsc.pro 2009-10-13 17:34:08.000000000 +0200
e97947e7d45e update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 491
diff changeset
307 +++ qt-everywhere-opensource-src-4.6.0-beta1/src/3rdparty/webkit/JavaScriptCore/jsc.pro 2009-10-25 20:23:25.000000000 +0100
e97947e7d45e update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 491
diff changeset
308 @@ -20,6 +20,13 @@
e97947e7d45e update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 491
diff changeset
309 } else { # Release
e97947e7d45e update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 491
diff changeset
310 OBJECTS_DIR = obj/release
e97947e7d45e update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 491
diff changeset
311 }
e97947e7d45e update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 491
diff changeset
312 +
e97947e7d45e update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 491
diff changeset
313 +# MAB: Added by analogy to JavaScriptCore.pro and WebCore.pro
e97947e7d45e update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 491
diff changeset
314 +# JavaScriptCore.pri needs to know path for generated sources
e97947e7d45e update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 491
diff changeset
315 +isEmpty(GENERATED_SOURCES_DIR):GENERATED_SOURCES_DIR = generated
e97947e7d45e update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 491
diff changeset
316 +GENERATED_SOURCES_DIR_SLASH = $${GENERATED_SOURCES_DIR}$${QMAKE_DIR_SEP}
e97947e7d45e update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 491
diff changeset
317 +
e97947e7d45e update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 491
diff changeset
318 +INCLUDEPATH += $$GENERATED_SOURCES_DIR
e97947e7d45e update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 491
diff changeset
319 OBJECTS_DIR_WTR = $$OBJECTS_DIR$${QMAKE_DIR_SEP}
e97947e7d45e update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 491
diff changeset
320 include($$PWD/JavaScriptCore.pri)
e97947e7d45e update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 491
diff changeset
321
e97947e7d45e update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 491
diff changeset
322 --- qt-everywhere-opensource-src-4.6.0-beta1.native/src/3rdparty/webkit/WebKit/qt/Plugins/Plugins.pro 2009-10-13 17:34:08.000000000 +0200
e97947e7d45e update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 491
diff changeset
323 +++ qt-everywhere-opensource-src-4.6.0-beta1/src/3rdparty/webkit/WebKit/qt/Plugins/Plugins.pro 2009-10-25 21:08:46.000000000 +0100
e97947e7d45e update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 491
diff changeset
324 @@ -4,7 +4,7 @@
e97947e7d45e update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 491
diff changeset
325 HEADERS += ICOHandler.h
e97947e7d45e update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 491
diff changeset
326 SOURCES += ICOHandler.cpp
e97947e7d45e update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 491
diff changeset
327
e97947e7d45e update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 491
diff changeset
328 -include(../../WebKit.pri)
e97947e7d45e update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 491
diff changeset
329 +include(../../../WebKit.pri)
e97947e7d45e update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 491
diff changeset
330
e97947e7d45e update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 491
diff changeset
331 contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
e97947e7d45e update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 491
diff changeset
332 unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions
e97947e7d45e update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 491
diff changeset
333 --- qt-everywhere-opensource-src-4.6.0-beta1.native/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pro 2009-10-13 17:34:08.000000000 +0200
e97947e7d45e update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 491
diff changeset
334 +++ qt-everywhere-opensource-src-4.6.0-beta1/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pro 2009-10-25 13:17:35.000000000 +0100
e97947e7d45e update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 491
diff changeset
335 @@ -16,7 +16,7 @@
e97947e7d45e update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 491
diff changeset
336 include($$QT_SOURCE_TREE/src/qbase.pri)
e97947e7d45e update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 491
diff changeset
337 INSTALLS =
e97947e7d45e update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 491
diff changeset
338 DESTDIR = $$OLDDESTDIR
e97947e7d45e update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 491
diff changeset
339 - PRECOMPILED_HEADER = $$PWD/../WebKit/qt/WebKit_pch.h
e97947e7d45e update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 491
diff changeset
340 + PRECOMPILED_HEADER = $$PWD/../../webkit/WebKit/qt/WebKit_pch.h
e97947e7d45e update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 491
diff changeset
341 DEFINES *= NDEBUG
e97947e7d45e update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 491
diff changeset
342 }
e97947e7d45e update version of package qt (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents: 491
diff changeset
343