mxe-octave: src/qt-1-win32.patch annotate

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

improved naming of patch files

author	Volker Grabsch <vog@notjusthosting.com>
date	Fri, 14 May 2010 19:59:46 +0200
parents
children	37e7bea19863

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

Mercurial > mxe-octave

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