Mercurial > mxe-octave

comparison src/qt-1-win32.patch @ 972:e5d55b815b89

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
improved naming of patch files
author Volker Grabsch <vog@notjusthosting.com>
date Fri, 14 May 2010 19:59:46 +0200
parents
children 37e7bea19863
comparison
equal deleted inserted replaced
971:d22c7eaea312 972:e5d55b815b89
1 This file is part of mingw-cross-env.
2 See doc/index.html for further information.
3
4 diff --git a/config.tests/unix/compile.test b/config.tests/unix/compile.test
5 index 67a4636..fa54560 100755
6 --- a/config.tests/unix/compile.test
7 +++ b/config.tests/unix/compile.test
8 @@ -66,7 +66,7 @@ cd "$OUTDIR/$TEST"
9
10 test -r Makefile && $MAKE distclean >/dev/null 2>&1
11
12 -"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
13 +"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG-=debug_and_release" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
14
15 if [ "$VERBOSE" = "yes" ]; then
16 $MAKE
17 @@ -74,7 +74,7 @@ else
18 $MAKE >/dev/null 2>&1
19 fi
20
21 -[ -x "$EXE" ] && SUCCESS=yes
22 +[ -x "$EXE" ] || [ -x "${EXE}.exe" ] && SUCCESS=yes
23
24 # done
25 if [ "$SUCCESS" != "yes" ]; then
26 diff --git a/config.tests/unix/getaddrinfo/getaddrinfotest.cpp b/config.tests/unix/getaddrinfo/getaddrinfotest.cpp
27 index a00bf15..cb562fe 100644
28 --- a/config.tests/unix/getaddrinfo/getaddrinfotest.cpp
29 +++ b/config.tests/unix/getaddrinfo/getaddrinfotest.cpp
30 @@ -42,9 +42,16 @@
31 /* Sample program for configure to test for getaddrinfo on the unix
32 platform. we check for all structures and functions required. */
33
34 +#include <stdio.h>
35 +#include <stdlib.h>
36 +#ifdef __MINGW32__
37 +#include <winsock2.h>
38 +#include <ws2tcpip.h>
39 +#else
40 #include <sys/types.h>
41 #include <sys/socket.h>
42 #include <netdb.h>
43 +#endif
44
45 int main()
46 {
47 diff --git a/config.tests/unix/iconv/iconv.pro b/config.tests/unix/iconv/iconv.pro
48 index 8cdc776..898a017 100644
49 --- a/config.tests/unix/iconv/iconv.pro
50 +++ b/config.tests/unix/iconv/iconv.pro
51 @@ -1,3 +1,3 @@
52 SOURCES = iconv.cpp
53 CONFIG -= qt dylib app_bundle
54 -mac:LIBS += -liconv
55 +mac|win32-g++:LIBS += -liconv
56 diff --git a/config.tests/unix/ipv6/ipv6test.cpp b/config.tests/unix/ipv6/ipv6test.cpp
57 index 3dc30c3..5783a85 100644
58 --- a/config.tests/unix/ipv6/ipv6test.cpp
59 +++ b/config.tests/unix/ipv6/ipv6test.cpp
60 @@ -46,9 +46,14 @@ platforms. We check for the required IPv6 data structures. */
61 #define _HPUX_SOURCE
62 #endif
63
64 +#ifdef __MINGW32__
65 +#include <winsock2.h>
66 +#include <ws2tcpip.h>
67 +#else
68 #include <sys/types.h>
69 #include <sys/socket.h>
70 #include <netinet/in.h>
71 +#endif
72
73 int main()
74 {
75 diff --git a/config.tests/unix/largefile/largefiletest.cpp b/config.tests/unix/largefile/largefiletest.cpp
76 index a5d7313..3a8924c 100644
77 --- a/config.tests/unix/largefile/largefiletest.cpp
78 +++ b/config.tests/unix/largefile/largefiletest.cpp
79 @@ -51,6 +51,9 @@ platforms.
80 #include <sys/stat.h>
81 #include <assert.h>
82 #include <stdio.h>
83 +#ifdef __MINGW32__
84 +#define ftello ftello64
85 +#endif
86
87 int main( int, char **argv )
88 {
89 diff --git a/config.tests/unix/odbc/odbc.cpp b/config.tests/unix/odbc/odbc.cpp
90 index 7092c58..f28712e 100644
91 --- a/config.tests/unix/odbc/odbc.cpp
92 +++ b/config.tests/unix/odbc/odbc.cpp
93 @@ -38,7 +38,9 @@
94 ** $QT_END_LICENSE$
95 **
96 ****************************************************************************/
97 -
98 +#ifdef __MINGW32__
99 +#include <windows.h>
100 +#endif
101 #include <sql.h>
102 #include <sqlext.h>
103
104 diff --git a/config.tests/unix/odbc/odbc.pro b/config.tests/unix/odbc/odbc.pro
105 index c588ede..740582a 100644
106 --- a/config.tests/unix/odbc/odbc.pro
107 +++ b/config.tests/unix/odbc/odbc.pro
108 @@ -1,4 +1,5 @@
109 SOURCES = odbc.cpp
110 CONFIG -= qt dylib
111 mac:CONFIG -= app_bundle
112 -LIBS += -lodbc
113 +win32-g++:LIBS += -lodbc32
114 +else:LIBS += -lodbc
115 diff --git a/config.tests/unix/rtti/rtti.cpp b/config.tests/unix/rtti/rtti.cpp
116 new file mode 100644
117 index 0000000..e78103c
118 --- /dev/null
119 +++ b/config.tests/unix/rtti/rtti.cpp
120 @@ -0,0 +1,45 @@
121 +/****************************************************************************
122 +**
123 +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
124 +** All rights reserved.
125 +** Contact: Nokia Corporation (qt-info@nokia.com)
126 +**
127 +** This file is part of the config.tests of the Qt Toolkit.
128 +**
129 +** $QT_BEGIN_LICENSE:LGPL$
130 +** Commercial Usage
131 +** Licensees holding valid Qt Commercial licenses may use this file in
132 +** accordance with the Qt Commercial License Agreement provided with the
133 +** Software or, alternatively, in accordance with the terms contained in
134 +** a written agreement between you and Nokia.
135 +**
136 +** GNU Lesser General Public License Usage
137 +** Alternatively, this file may be used under the terms of the GNU Lesser
138 +** General Public License version 2.1 as published by the Free Software
139 +** Foundation and appearing in the file LICENSE.LGPL included in the
140 +** packaging of this file. Please review the following information to
141 +** ensure the GNU Lesser General Public License version 2.1 requirements
142 +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
143 +**
144 +** In addition, as a special exception, Nokia gives you certain additional
145 +** rights. These rights are described in the Nokia Qt LGPL Exception
146 +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
147 +**
148 +** GNU General Public License Usage
149 +** Alternatively, this file may be used under the terms of the GNU
150 +** General Public License version 3.0 as published by the Free Software
151 +** Foundation and appearing in the file LICENSE.GPL included in the
152 +** packaging of this file. Please review the following information to
153 +** ensure the GNU General Public License version 3.0 requirements will be
154 +** met: http://www.gnu.org/copyleft/gpl.html.
155 +**
156 +** If you have questions regarding the use of this file, please contact
157 +** Nokia at qt-info@nokia.com.
158 +** $QT_END_LICENSE$
159 +**
160 +****************************************************************************/
161 +
162 +int main(int, char**)
163 +{
164 + return 0;
165 +}
166 diff --git a/config.tests/unix/rtti/rtti.pro b/config.tests/unix/rtti/rtti.pro
167 new file mode 100644
168 index 0000000..d0aae30
169 --- /dev/null
170 +++ b/config.tests/unix/rtti/rtti.pro
171 @@ -0,0 +1,3 @@
172 +SOURCES = rtti.cpp
173 +CONFIG -= x11 qt
174 +mac:CONFIG -= app_bundle
175 diff --git a/config.tests/x11/opengl/opengl.pro b/config.tests/x11/opengl/opengl.pro
176 index 432bd8d..94faf15 100644
177 --- a/config.tests/x11/opengl/opengl.pro
178 +++ b/config.tests/x11/opengl/opengl.pro
179 @@ -7,4 +7,5 @@ for(p, QMAKE_LIBDIR_OPENGL) {
180 }
181
182 CONFIG -= qt
183 -LIBS += -lGL -lGLU
184 +win32-g++:LIBS += -lopengl32
185 +else:LIBS += -lGL -lGLU
186 diff --git a/configure b/configure
187 index ed5891f..a070d78 100755
188 --- a/configure
189 +++ b/configure
190 @@ -178,6 +178,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
191 # window system detection
192 #-------------------------------------------------------------------------------
193
194 +# XPLATFROM win32-g++ is treated as a subcase of PLATFORM_X11 for convenience
195 PLATFORM_X11=no
196 PLATFORM_MAC=no
197 PLATFORM_QWS=no
198 @@ -605,7 +606,7 @@ mkdir -p "$outpath/config.tests"
199 rm -f "$outpath/config.tests/.qmake.cache"
200 cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache"
201
202 -QMakeVar add styles "cde mac motif plastique cleanlooks windows"
203 +QMakeVar add styles "cde mac motif plastique cleanlooks windows windowsxp windowsvista"
204 QMakeVar add decorations "default windows styled"
205 QMakeVar add mouse-drivers "pc"
206 if [ "$UNAME_SYSTEM" = "Linux" ] ; then
207 @@ -733,6 +734,7 @@ CFG_MMX=auto
208 CFG_3DNOW=auto
209 CFG_SSE=auto
210 CFG_SSE2=auto
211 +CFG_RTTI=auto
212 CFG_REDUCE_RELOCATIONS=no
213 CFG_IPV6=auto
214 CFG_NAS=no
215 @@ -1602,6 +1604,13 @@ while [ "$#" -gt 0 ]; do
216 UNKNOWN_OPT=yes
217 fi
218 ;;
219 + rtti)
220 + if [ "$VAL" = "no" ]; then
221 + CFG_RTTI="$VAL"
222 + else
223 + UNKNOWN_OPT=yes
224 + fi
225 + ;;
226 iwmmxt)
227 CFG_IWMMXT="yes"
228 ;;
229 @@ -3482,6 +3491,7 @@ cat << EOF
230 -no-3dnow .......... Do not compile with use of 3DNOW instructions.
231 -no-sse ............ Do not compile with use of SSE instructions.
232 -no-sse2 ........... Do not compile with use of SSE2 instructions.
233 + -no-rtti ........... Do not compile with RTTI.
234
235 -qtnamespace <name> Wraps all Qt library code in 'namespace <name> {...}'.
236 -qtlibinfix <infix> Renames all libQt*.so to libQt*<infix>.so.
237 @@ -4508,6 +4518,17 @@ if [ "${CFG_SSE2}" = "auto" ]; then
238 fi
239 fi
240
241 +# detect rtti support
242 +if [ "${CFG_RTTI}" = "auto" ]; then
243 + if [ "$XPLATFORM" != "win32-g++" ]; then
244 + CFG_RTTI=no
245 + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/rtti "rtti" $L_FLAGS $I_FLAGS $l_FLAGS "-frtti"; then
246 + CFG_RTTI=yes
247 + else
248 + CFG_RTTI=no
249 + fi
250 +fi
251 +
252 # check iWMMXt support
253 if [ "$CFG_IWMMXT" = "yes" ]; then
254 "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/iwmmxt "iwmmxt" $L_FLAGS $I_FLAGS $l_FLAGS "-mcpu=iwmmxt"
255 @@ -4683,6 +4704,7 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
256 if "$WHICH" pg_config >/dev/null 2>&1; then
257 QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null`
258 QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null`
259 + QT_LFLAGS_PSQL="$QT_LFLAGS_PSQL $PSQL_LIBS"
260 fi
261 [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL"
262 [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL"
263 @@ -4707,7 +4729,7 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
264 ;;
265 odbc)
266 if [ "$CFG_SQL_odbc" != "no" ]; then
267 - 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
268 + if [ "$PLATFORM_MAC" != "yes" ] || [ "$XPLATFORM" = "win32-g++" ] && "$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
269 if [ "$CFG_SQL_odbc" = "auto" ]; then
270 CFG_SQL_odbc=plugin
271 fi
272 @@ -5002,7 +5024,10 @@ if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" ]; then
273 fi
274
275 if [ "$CFG_PHONON" != "no" ]; then
276 - if [ "$CFG_PHONON_BACKEND" != "no" ]; then
277 + if [ "$XPLATFORM" = "win32-g++" ]; then
278 + echo "Will build Phonon for win32-g++"
279 + CFG_PHONON=yes
280 + elif [ "$CFG_PHONON_BACKEND" != "no" ]; then
281 if [ "$CFG_GLIB" = "yes" -a "$CFG_GSTREAMER" != "no" ]; then
282 if [ -n "$PKG_CONFIG" ]; then
283 QT_CFLAGS_GSTREAMER=`$PKG_CONFIG --cflags gstreamer-0.10 gstreamer-plugins-base-0.10 2>/dev/null`
284 @@ -5060,8 +5085,9 @@ if [ "$PLATFORM_X11" = "yes" ]; then
285 fi
286
287 # Check we actually have X11 :-)
288 - "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS
289 - if [ $? != "0" ]; then
290 + if [ "$XPLATFORM" = "win32-g++" ]; then
291 + echo "Skipping XLib test for win32-g++"
292 + elif ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
293 echo "Basic XLib functionality test failed!"
294 echo " You might need to modify the include and library search paths by editing"
295 echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}."
296 @@ -6141,6 +6167,7 @@ fi
297 [ "$CFG_3DNOW" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG 3dnow"
298 [ "$CFG_SSE" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG sse"
299 [ "$CFG_SSE2" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG sse2"
300 +[ "$CFG_RTTI" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG rtti"
301 [ "$CFG_IWMMXT" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG iwmmxt"
302 [ "$CFG_NEON" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG neon"
303 [ "$PLATFORM_MAC" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG $CFG_MAC_ARCHS"
304 @@ -6222,7 +6249,7 @@ else
305 QT_CONFIG="$QT_CONFIG freetype"
306 fi
307
308 -if [ "x$PLATFORM_MAC" = "xyes" ]; then
309 +if [ "x$PLATFORM_MAC" = "xyes" ] && [ "$XPLATFORM" != "win32-g++" ]; then
310 #On Mac we implicitly link against libz, so we
311 #never use the 3rdparty stuff.
312 [ "$CFG_ZLIB" = "yes" ] && CFG_ZLIB="system"
313 @@ -7161,7 +7188,7 @@ fi
314
315 cat >>"$QTCONFIG.tmp" <<EOF
316 #configuration
317 -CONFIG += $QTCONFIG_CONFIG
318 +CONFIG += $QMAKE_CONFIG $QTCONFIG_CONFIG
319 QT_ARCH = $CFG_ARCH
320 QT_EDITION = $Edition
321 QT_CONFIG += $QT_CONFIG
322 @@ -7434,7 +7461,7 @@ fi
323 echo "Declarative module .. $CFG_DECLARATIVE"
324 echo "STL support ......... $CFG_STL"
325 echo "PCH support ......... $CFG_PRECOMPILE"
326 -echo "MMX/3DNOW/SSE/SSE2.. ${CFG_MMX}/${CFG_3DNOW}/${CFG_SSE}/${CFG_SSE2}"
327 +echo "MMX/3DNOW/SSE/SSE2/RTTI.. ${CFG_MMX}/${CFG_3DNOW}/${CFG_SSE}/${CFG_SSE2}/${CFG_RTTI}"
328 if [ "$CFG_ARCH" = "arm" ] || [ "$CFG_ARCH" = "armv6" ]; then
329 echo "iWMMXt support ...... ${CFG_IWMMXT}"
330 echo "NEON support ........ ${CFG_NEON}"
331 @@ -7752,7 +7779,11 @@ for file in .projects .projects.3; do
332 [ "$IN_ROOT" = "no" ] && continue
333
334 case $a in
335 - *winmain/winmain.pro) continue ;;
336 + *winmain/winmain.pro)
337 + case "$XPLATFORM" in
338 + win32*) SPEC=$XQMAKESPEC ;;
339 + *) continue ;;
340 + esac ;;
341 *s60main/s60main.pro) continue ;;
342 *examples/activeqt/*) continue ;;
343 */qmake/qmake.pro) continue ;;
344 diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf
345 index b282f69..b537bc7 100644
346 --- a/mkspecs/win32-g++/qmake.conf
347 +++ b/mkspecs/win32-g++/qmake.conf
348 @@ -3,23 +3,31 @@
349 #
350 # Written for MinGW
351 #
352 +load(qt_config)
353
354 MAKEFILE_GENERATOR = MINGW
355 TEMPLATE = app
356 CONFIG += qt warn_on release link_prl copy_dir_files debug_and_release debug_and_release_target precompile_header
357 +CONFIG += windows win32
358 +CONFIG -= freetype
359 +QT_CONFIG -= freetype
360 QT += core gui
361 DEFINES += UNICODE QT_LARGEFILE_SUPPORT
362 +DEFINES -= QT_LARGEFILE_SUPPORT
363 +DEFINES += QT_TABLET QT_SESSIONMANAGER QT_NO_DIRECT3D QT_NO_CODECS
364 QMAKE_COMPILER_DEFINES += __GNUC__ WIN32
365
366 QMAKE_EXT_OBJ = .o
367 QMAKE_EXT_RES = _res.o
368
369 -QMAKE_CC = gcc
370 +QMAKE_CC = HOSTPLATFORMPREFIX-gcc
371 QMAKE_LEX = flex
372 QMAKE_LEXFLAGS =
373 QMAKE_YACC = byacc
374 QMAKE_YACCFLAGS = -d
375 QMAKE_CFLAGS =
376 +QMAKE_CFLAGS += -isystem HOSTPLATFORMINCLUDE
377 +QMAKE_CFLAGS += -pipe
378 QMAKE_CFLAGS_DEPS = -M
379 QMAKE_CFLAGS_WARN_ON = -Wall
380 QMAKE_CFLAGS_WARN_OFF = -w
381 @@ -27,7 +35,7 @@ QMAKE_CFLAGS_RELEASE = -O2
382 QMAKE_CFLAGS_DEBUG = -g
383 QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses
384
385 -QMAKE_CXX = g++
386 +QMAKE_CXX = HOSTPLATFORMPREFIX-g++
387 QMAKE_CXXFLAGS = $$QMAKE_CFLAGS
388 QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS
389 QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
390 @@ -42,6 +50,7 @@ QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions -mthreads
391 QMAKE_CXXFLAGS_EXCEPTIONS_OFF = -fno-exceptions
392
393 QMAKE_INCDIR =
394 +QMAKE_INCDIR += .
395 QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS]
396 QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS]
397
398 @@ -50,8 +59,8 @@ QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
399 QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src
400 QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
401
402 -QMAKE_LINK = g++
403 -QMAKE_LINK_C = gcc
404 +QMAKE_LINK = HOSTPLATFORMPREFIX-g++
405 +QMAKE_LINK_C = HOSTPLATFORMPREFIX-gcc
406 QMAKE_LFLAGS = -enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc
407 QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads -Wl
408 QMAKE_LFLAGS_EXCEPTIONS_OFF =
409 @@ -72,15 +81,18 @@ QMAKE_LIBS_OPENGL = -lopengl32 -lglu32 -lgdi32 -luser32
410 QMAKE_LIBS_COMPAT = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32
411 QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain
412
413 +QMAKE_SH = bash
414 +
415 !isEmpty(QMAKE_SH) {
416 MINGW_IN_SHELL = 1
417 QMAKE_DIR_SEP = /
418 QMAKE_COPY = cp
419 - QMAKE_COPY_DIR = xcopy /s /q /y /i
420 + QMAKE_COPY_DIR = cp -r
421 QMAKE_MOVE = mv
422 - QMAKE_DEL_FILE = rm
423 - QMAKE_MKDIR = mkdir
424 + QMAKE_DEL_FILE = rm -f
425 + QMAKE_MKDIR = mkdir -p
426 QMAKE_DEL_DIR = rmdir
427 + QMAKE_SYMBOLIC_LINK = ln -s
428 QMAKE_CHK_DIR_EXISTS = test -d
429 } else {
430 QMAKE_COPY = copy /y
431 @@ -92,15 +104,16 @@ QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain
432 QMAKE_CHK_DIR_EXISTS = if not exist
433 }
434
435 -QMAKE_MOC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}moc.exe
436 -QMAKE_UIC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}uic.exe
437 -QMAKE_IDC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}idc.exe
438 +#QMAKE_IDC = HOSTPLATFORMPREFIX-idc
439 +QMAKE_MOC = HOSTPLATFORMPREFIX-moc
440 +QMAKE_RCC = HOSTPLATFORMPREFIX-rcc
441 +QMAKE_UIC = HOSTPLATFORMPREFIX-uic
442
443 -QMAKE_IDL = midl
444 -QMAKE_LIB = ar -ru
445 -QMAKE_RC = windres
446 +#QMAKE_IDL = midl
447 +QMAKE_LIB = HOSTPLATFORMPREFIX-ar -ru
448 +QMAKE_RC = HOSTPLATFORMPREFIX-windres
449 QMAKE_ZIP = zip -r -9
450
451 -QMAKE_STRIP = strip
452 +QMAKE_STRIP = HOSTPLATFORMPREFIX-strip
453 QMAKE_STRIPFLAGS_LIB += --strip-unneeded
454 -load(qt_config)
455 +PKG_CONFIG = HOSTPLATFORMPREFIX-pkg-config
456 diff --git a/src/3rdparty/phonon/ds9/videorenderer_soft.cpp b/src/3rdparty/phonon/ds9/videorenderer_soft.cpp
457 index f7d42cf..9c7993c 100644
458 --- a/src/3rdparty/phonon/ds9/videorenderer_soft.cpp
459 +++ b/src/3rdparty/phonon/ds9/videorenderer_soft.cpp
460 @@ -45,7 +45,7 @@ along with this library. If not, see <http://www.gnu.org/licenses/>.
461 #endif
462
463 #ifndef QT_NO_OPENGL
464 -#include <gl/gl.h>
465 +#include <GL/gl.h>
466 #ifndef GL_FRAGMENT_PROGRAM_ARB
467 #define GL_FRAGMENT_PROGRAM_ARB 0x8804
468 #define GL_PROGRAM_FORMAT_ASCII_ARB 0x8875
469 diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri
470 index 3406e41..e171584 100644
471 --- a/src/corelib/tools/tools.pri
472 +++ b/src/corelib/tools/tools.pri
473 @@ -96,8 +96,8 @@ contains(QT_CONFIG, zlib) {
474 ../3rdparty/zlib/uncompr.c \
475 ../3rdparty/zlib/zutil.c
476 } else:!contains(QT_CONFIG, no-zlib) {
477 - unix:LIBS_PRIVATE += -lz
478 -# win32:LIBS += libz.lib
479 + unix|win32-g++:LIBS_PRIVATE += -lz
480 + win32:!win32-g++:LIBS += zdll.lib
481 }
482
483 DEFINES += HB_EXPORT=Q_CORE_EXPORT
484 diff --git a/src/gui/image/image.pri b/src/gui/image/image.pri
485 index b67be55..6642ae3 100644
486 --- a/src/gui/image/image.pri
487 +++ b/src/gui/image/image.pri
488 @@ -93,11 +93,11 @@ SOURCES += \
489 SOURCES += image/qpnghandler.cpp
490
491 contains(QT_CONFIG, system-png) {
492 - unix:LIBS_PRIVATE += -lpng
493 - win32:LIBS += libpng.lib
494 + unix|win32-g++:LIBS_PRIVATE += -lpng
495 + win32:!win32-g++:LIBS += libpng.lib
496 } else {
497 !isEqual(QT_ARCH, i386):!isEqual(QT_ARCH, x86_64):DEFINES += PNG_NO_ASSEMBLER_CODE
498 - INCLUDEPATH += ../3rdparty/libpng ../3rdparty/zlib
499 + INCLUDEPATH += ../3rdparty/libpng
500 SOURCES += ../3rdparty/libpng/png.c \
501 ../3rdparty/libpng/pngerror.c \
502 ../3rdparty/libpng/pngget.c \
503 @@ -115,6 +115,10 @@ SOURCES += \
504 ../3rdparty/libpng/pngwutil.c \
505 ../3rdparty/libpng/pnggccrd.c
506 }
507 + contains(QT_CONFIG, system-zlib) {
508 + unix|win32-g++:LIBS_PRIVATE += -lz
509 + win32:!win32-g++:LIBS += zdll.lib
510 + }
511 } else {
512 DEFINES *= QT_NO_IMAGEFORMAT_PNG
513 }
514 diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri
515 index a6cc9c7..95779a1 100644
516 --- a/src/gui/painting/painting.pri
517 +++ b/src/gui/painting/painting.pri
518 @@ -387,9 +387,9 @@ neon {
519 }
520
521 contains(QT_CONFIG, zlib) {
522 - INCLUDEPATH += ../3rdparty/zlib
523 + INCLUDEPATH += ../3rdparty/zlib
524 } else:!contains(QT_CONFIG, no-zlib) {
525 - unix:LIBS_PRIVATE += -lz
526 -# win32:LIBS += libz.lib
527 + unix|win32-g++:LIBS_PRIVATE += -lz
528 + win32:!win32-g++:LIBS += zdll.lib
529 }
530
531 diff --git a/src/network/access/access.pri b/src/network/access/access.pri
532 index aa36890..f009761 100644
533 --- a/src/network/access/access.pri
534 +++ b/src/network/access/access.pri
535 @@ -59,8 +59,8 @@ SOURCES += access/qftp.cpp \
536
537 #zlib support
538 contains(QT_CONFIG, zlib) {
539 - INCLUDEPATH += ../3rdparty/zlib
540 + INCLUDEPATH += ../3rdparty/zlib
541 } else:!contains(QT_CONFIG, no-zlib) {
542 - unix:LIBS_PRIVATE += -lz
543 -# win32:LIBS += libz.lib
544 + unix|win32-g++:LIBS_PRIVATE += -lz
545 + win32:!win32-g++:LIBS += zdll.lib
546 }
547 diff --git a/src/network/ssl/ssl.pri b/src/network/ssl/ssl.pri
548 index 72ea80f..cf31a5b 100644
549 --- a/src/network/ssl/ssl.pri
550 +++ b/src/network/ssl/ssl.pri
551 @@ -34,6 +34,7 @@ symbian {
552 # Include Qt's default CA bundle
553 RESOURCES += network.qrc
554
555 - # Add optional SSL libs
556 + # Add optional SSL libs, but not accidently system zlib
557 + !contains(QT_CONFIG, system-zlib):OPENSSL_LIBS -= -lz
558 LIBS_PRIVATE += $$OPENSSL_LIBS
559 }
560 diff --git a/src/plugins/imageformats/jpeg/jpeg.pro b/src/plugins/imageformats/jpeg/jpeg.pro
561 index ebc79cc..30a19c6 100644
562 --- a/src/plugins/imageformats/jpeg/jpeg.pro
563 +++ b/src/plugins/imageformats/jpeg/jpeg.pro
564 @@ -20,8 +20,8 @@ symbian: {
565 }
566
567 contains(QT_CONFIG, system-jpeg) {
568 - unix:LIBS += -ljpeg
569 - win32:LIBS += libjpeg.lib
570 + unix|win32-g++:LIBS += -ljpeg
571 + win32:!win32-g++:LIBS += libjpeg.lib
572 }
573 !contains(QT_CONFIG, system-jpeg) {
574 INCLUDEPATH += ../../../3rdparty/libjpeg
575 diff --git a/src/plugins/imageformats/mng/mng.pro b/src/plugins/imageformats/mng/mng.pro
576 index de7dfa7..46c84c4 100644
577 --- a/src/plugins/imageformats/mng/mng.pro
578 +++ b/src/plugins/imageformats/mng/mng.pro
579 @@ -14,8 +14,8 @@ symbian: {
580 }
581
582 contains(QT_CONFIG, system-mng) {
583 - unix:LIBS += -lmng
584 - win32:LIBS += libmng.lib
585 + unix|win32-g++:LIBS += -lmng
586 + win32:!win32-g++:LIBS += libmng.lib
587 }
588 !contains(QT_CONFIG, system-mng) {
589 DEFINES += MNG_BUILD_SO
590 @@ -44,10 +44,11 @@ contains(QT_CONFIG, system-mng) {
591 }
592
593 contains(QT_CONFIG, system-zlib) {
594 - LIBS += -lz
595 + unix|win32-g++:LIBS_PRIVATE += -lz
596 + win32:!win32-g++:LIBS += zdll.lib
597 }
598 !contains(QT_CONFIG, system-zlib) {
599 - INCLUDEPATH += ../../../3rdparty/zlib
600 + INCLUDEPATH += ../../../3rdparty/zlib
601 }
602
603 QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/imageformats
604 diff --git a/src/plugins/imageformats/tiff/tiff.pro b/src/plugins/imageformats/tiff/tiff.pro
605 index 312f99c..29d36f4 100644
606 --- a/src/plugins/imageformats/tiff/tiff.pro
607 +++ b/src/plugins/imageformats/tiff/tiff.pro
608 @@ -8,8 +8,13 @@ SOURCES += main.cpp \
609 qtiffhandler.cpp
610
611 contains(QT_CONFIG, system-tiff) {
612 - unix:LIBS += -ltiff
613 - win32:LIBS += libtiff.lib
614 + unix|win32-g++:LIBS += -ltiff
615 + win32:!win32-g++:LIBS += libtiff.lib
616 +
617 + contains(QT_CONFIG, system-jpeg) {
618 + unix|win32-g++:LIBS += -ljpeg
619 + win32:!win32-g++:LIBS += libjpeg.lib
620 + }
621 }
622 !contains(QT_CONFIG, system-tiff) {
623 INCLUDEPATH += ../../../3rdparty/libtiff/libtiff
624 @@ -62,10 +67,11 @@ contains(QT_CONFIG, system-tiff) {
625 }
626
627 contains(QT_CONFIG, system-zlib) {
628 - LIBS += -lz
629 + unix|win32-g++:LIBS_PRIVATE += -lz
630 + win32:!win32-g++:LIBS += zdll.lib
631 }
632 !contains(QT_CONFIG, system-zlib) {
633 - INCLUDEPATH += ../../../3rdparty/zlib
634 + INCLUDEPATH += ../../../3rdparty/zlib
635 }
636
637 QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/imageformats
638 diff --git a/src/plugins/sqldrivers/psql/psql.pro b/src/plugins/sqldrivers/psql/psql.pro
639 index 29fbada..0a38ee4 100644
640 --- a/src/plugins/sqldrivers/psql/psql.pro
641 +++ b/src/plugins/sqldrivers/psql/psql.pro
642 @@ -4,18 +4,15 @@ HEADERS = ../../../sql/drivers/psql/qsql_psql.h
643 SOURCES = main.cpp \
644 ../../../sql/drivers/psql/qsql_psql.cpp
645
646 -unix: {
647 +unix|win32-g++: {
648 !isEmpty(QT_LFLAGS_PSQL) {
649 - LIBS *= $$QT_LFLAGS_PSQL
650 + !contains(QT_CONFIG, system-zlib): QT_LFLAGS_PSQL -= -lz
651 + !static:LIBS *= $$QT_LFLAGS_PSQL
652 QMAKE_CXXFLAGS *= $$QT_CFLAGS_PSQL
653 }
654 !contains(LIBS, .*pq.*):LIBS *= -lpq
655 }
656
657 -win32:!contains(LIBS, .*pq.* ) {
658 - !win32-g++:LIBS *= -llibpq
659 - win32-g++:LIBS *= -lpq
660 - LIBS *= -lws2_32 -ladvapi32
661 -}
662 +win32:!win32-g++:!contains(LIBS, .*pq.* ) LIBS *= -llibpq -lws2_32 -ladvapi32
663
664 include(../qsqldriverbase.pri)
665 diff --git a/src/plugins/sqldrivers/tds/main.cpp b/src/plugins/sqldrivers/tds/main.cpp
666 index eb654ef..0a17f17 100644
667 --- a/src/plugins/sqldrivers/tds/main.cpp
668 +++ b/src/plugins/sqldrivers/tds/main.cpp
669 @@ -47,6 +47,7 @@
670 #define _WINSCARD_H_
671 #include <windows.h>
672 #endif
673 +#define Q_USE_SYBASE
674 #include "../../../sql/drivers/tds/qsql_tds.h"
675
676 QT_BEGIN_NAMESPACE
677 diff --git a/src/plugins/sqldrivers/tds/tds.pro b/src/plugins/sqldrivers/tds/tds.pro
678 index 08a166b..f66d5b7 100644
679 --- a/src/plugins/sqldrivers/tds/tds.pro
680 +++ b/src/plugins/sqldrivers/tds/tds.pro
681 @@ -6,8 +6,9 @@ SOURCES = main.cpp \
682 ../../../sql/drivers/tds/qsql_tds.cpp
683
684 unix:!contains( LIBS, .*sybdb.* ):LIBS *= -lsybdb
685 +win32-g++:LIBS *= -lsybdb -liconv -lws2_32
686
687 -win32 {
688 +win32:!win32-g++ {
689 !win32-borland:LIBS *= -lNTWDBLIB
690 win32-borland:LIBS *= $(BCB)/lib/PSDK/NTWDBLIB.LIB
691 }
692 diff --git a/src/qbase.pri b/src/qbase.pri
693 index 710a2b6..2c3e91c 100644
694 --- a/src/qbase.pri
695 +++ b/src/qbase.pri
696 @@ -85,7 +85,6 @@ win32-borland {
697 }
698
699 win32 {
700 - CONFIG += zlib
701 INCLUDEPATH += tmp
702 !static: DEFINES+=QT_MAKEDLL
703 }
704 diff --git a/src/sql/drivers/drivers.pri b/src/sql/drivers/drivers.pri
705 index 184eca9..aac0267 100644
706 --- a/src/sql/drivers/drivers.pri
707 +++ b/src/sql/drivers/drivers.pri
708 @@ -6,19 +6,16 @@ contains(sql-drivers, psql) {
709 HEADERS += drivers/psql/qsql_psql.h
710 SOURCES += drivers/psql/qsql_psql.cpp
711
712 - unix {
713 - !isEmpty(QT_LFLAGS_PSQL) {
714 - LIBS *= $$QT_LFLAGS_PSQL
715 + unix|win32-g++ {
716 + !static:!isEmpty(QT_LFLAGS_PSQL) {
717 + !contains(QT_CONFIG, system-zlib): QT_LFLAGS_PSQL -= -lz
718 + !static:LIBS *= $$QT_LFLAGS_PSQL
719 QMAKE_CXXFLAGS *= $$QT_CFLAGS_PSQL
720 }
721 !contains(LIBS, .*pq.*):LIBS *= -lpq
722 }
723
724 - win32 {
725 - !win32-g++:!contains( LIBS, .*pq.* ):LIBS *= -llibpq
726 - win32-g++:!contains( LIBS, .*pq.* ):LIBS *= -lpq
727 - LIBS *= -lws2_32 -ladvapi32
728 - }
729 + win32:!win32-g++:!contains(LIBS, .*pq.* ) LIBS *= -llibpq -lws2_32 -ladvapi32
730 }
731
732 contains(sql-drivers, mysql) {
733 diff --git a/src/sql/drivers/tds/qsql_tds.cpp b/src/sql/drivers/tds/qsql_tds.cpp
734 index 422f866..16785ed 100644
735 --- a/src/sql/drivers/tds/qsql_tds.cpp
736 +++ b/src/sql/drivers/tds/qsql_tds.cpp
737 @@ -47,7 +47,8 @@
738 #else
739 #define Q_USE_SYBASE
740 #endif
741 -
742 +//Force SYBASE because we use FreeTDS
743 +#define Q_USE_SYBASE
744 #include "qsql_tds.h"
745
746 #include <qvariant.h>
747 diff --git a/src/sql/drivers/tds/qsql_tds.h b/src/sql/drivers/tds/qsql_tds.h
748 index cb318f3..a6354ce 100644
749 --- a/src/sql/drivers/tds/qsql_tds.h
750 +++ b/src/sql/drivers/tds/qsql_tds.h
751 @@ -48,7 +48,8 @@
752
753 #ifdef Q_OS_WIN32
754 #define WIN32_LEAN_AND_MEAN
755 -#define DBNTWIN32 // indicates 32bit windows dblib
756 +//#define DBNTWIN32 // indicates 32bit windows dblib
757 +#include <winsock2.h>
758 #include <QtCore/qt_windows.h>
759 #include <sqlfront.h>
760 #include <sqldb.h>
761 diff --git a/src/svg/svg.pro b/src/svg/svg.pro
762 index d2a4227..0d3ef83 100644
763 --- a/src/svg/svg.pro
764 +++ b/src/svg/svg.pro
765 @@ -44,7 +44,8 @@ symbian:TARGET.UID3=0x2001B2E2
766
767 #zlib support
768 contains(QT_CONFIG, zlib) {
769 - INCLUDEPATH += ../3rdparty/zlib
770 + INCLUDEPATH += ../3rdparty/zlib
771 } else:!contains(QT_CONFIG, no-zlib) {
772 - unix:LIBS_PRIVATE += -lz
773 + unix|win32-g++:LIBS_PRIVATE += -lz
774 + win32:!win32-g++:LIBS += zdll.lib
775 }
776 diff --git a/src/tools/bootstrap/bootstrap.pri b/src/tools/bootstrap/bootstrap.pri
777 index b3ee948..18efe9d 100644
778 --- a/src/tools/bootstrap/bootstrap.pri
779 +++ b/src/tools/bootstrap/bootstrap.pri
780 @@ -52,8 +52,8 @@ hpux-acc*|hpuxi-acc* {
781 LIBS += -lbootstrap
782 }
783 !contains(QT_CONFIG, zlib):!contains(QT_CONFIG, no-zlib) {
784 - unix:LIBS += -lz
785 -# win32:LIBS += libz.lib
786 + unix|win32-g++:LIBS_PRIVATE += -lz
787 + win32:!win32-g++:LIBS += zdll.lib
788 }
789 win32:LIBS += -luser32
790
791 diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro
792 index 0dbb90f..e6b43a6 100644
793 --- a/src/tools/bootstrap/bootstrap.pro
794 +++ b/src/tools/bootstrap/bootstrap.pro
795 @@ -109,6 +109,9 @@ contains(QT_CONFIG, zlib) {
796 ../3rdparty/zlib/trees.c \
797 ../3rdparty/zlib/uncompr.c \
798 ../3rdparty/zlib/zutil.c
799 +} else:!contains(QT_CONFIG, no-zlib) {
800 + unix|win32-g++:LIBS_PRIVATE += -lz
801 + win32:!win32-g++:LIBS += zdll.lib
802 }
803
804 lib.CONFIG = dummy_install
805 diff --git a/src/winmain/winmain.pro b/src/winmain/winmain.pro
806 index bc322b9..f1fec05 100644
807 --- a/src/winmain/winmain.pro
808 +++ b/src/winmain/winmain.pro
809 @@ -11,7 +11,7 @@ win32 {
810 win32-g++:DEFINES += QT_NEEDS_QMAIN
811 win32-borland:DEFINES += QT_NEEDS_QMAIN
812 SOURCES = qtmain_win.cpp
813 - CONFIG += png zlib
814 + CONFIG += png
815 CONFIG -= jpeg
816 INCLUDEPATH += tmp $$QMAKE_INCDIR_QT/QtCore
817 }
818 diff --git a/tools/qvfb/qvfb.pro b/tools/qvfb/qvfb.pro
819 index dde7e8d..556dbcb 100644
820 --- a/tools/qvfb/qvfb.pro
821 +++ b/tools/qvfb/qvfb.pro
822 @@ -42,12 +42,14 @@ contains(QT_CONFIG, opengl) {
823 }
824
825 contains(QT_CONFIG, system-png) {
826 - LIBS += -lpng
827 + unix|win32-g++:LIBS_PRIVATE += -lpng
828 + win32:!win32-g++:LIBS += libpng.lib
829 } else {
830 INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/libpng
831 }
832 contains(QT_CONFIG, system-zlib) {
833 - LIBS += -lz
834 + unix|win32-g++:LIBS_PRIVATE += -lz
835 + win32:!win32-g++:LIBS += zdll.lib
836 } else {
837 INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/zlib
838 }