2009-10-03 20:11:16 +01:00
|
|
|
Copyright (C) 2009 Mark Brand
|
2009-10-04 02:29:37 +01:00
|
|
|
Volker Grabsch
|
2009-10-06 11:17:40 +01:00
|
|
|
Martin Lambers
|
2009-10-03 20:11:16 +01:00
|
|
|
|
|
|
|
Permission is hereby granted, free of charge, to any person obtaining
|
|
|
|
a copy of this software and associated documentation files (the
|
|
|
|
"Software"), to deal in the Software without restriction, including
|
|
|
|
without limitation the rights to use, copy, modify, merge, publish,
|
|
|
|
distribute, sublicense, and/or sell copies of the Software, and to
|
|
|
|
permit persons to whom the Software is furnished to do so, subject
|
|
|
|
to the following conditions:
|
|
|
|
|
|
|
|
The above copyright notice and this permission notice shall be
|
|
|
|
included in all copies or substantial portions of the Software.
|
|
|
|
|
|
|
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
|
|
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
|
|
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
|
|
|
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
|
|
|
|
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
|
|
|
|
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
|
|
|
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
|
|
|
several improvements to package qt (by Mark Brand)
* support for postgresql, tds and openssl
* fixed detection for float, zlib, libjpeg, libtiff, libmng,
libpng, postgresql, tds, sqlite, iconv,
STL, IPv6 and openssl
* added "-pipe" to CFLAGS to speed up build
2009-11-12 02:15:35 +00:00
|
|
|
--- a/configure 2009-10-13 17:34:09.000000000 +0200
|
|
|
|
+++ b/configure 2009-11-11 14:49:32.000000000 +0100
|
2009-10-03 20:11:16 +01:00
|
|
|
@@ -600,7 +600,7 @@
|
|
|
|
rm -f "$outpath/config.tests/.qmake.cache"
|
|
|
|
cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache"
|
|
|
|
|
|
|
|
-QMakeVar add styles "cde mac motif plastique cleanlooks windows"
|
|
|
|
+QMakeVar add styles "cde mac motif plastique cleanlooks windows windowsxp windowsvista"
|
|
|
|
QMakeVar add decorations "default windows styled"
|
|
|
|
QMakeVar add mouse-drivers "pc"
|
|
|
|
if [ "$UNAME_SYSTEM" = "Linux" ] ; then
|
2009-11-08 21:43:41 +00:00
|
|
|
@@ -725,6 +725,7 @@
|
|
|
|
CFG_3DNOW=auto
|
|
|
|
CFG_SSE=auto
|
|
|
|
CFG_SSE2=auto
|
|
|
|
+CFG_RTTI=auto
|
|
|
|
CFG_REDUCE_RELOCATIONS=no
|
|
|
|
CFG_IPV6=auto
|
|
|
|
CFG_NAS=no
|
several improvements to package qt (by Mark Brand)
* support for postgresql, tds and openssl
* fixed detection for float, zlib, libjpeg, libtiff, libmng,
libpng, postgresql, tds, sqlite, iconv,
STL, IPv6 and openssl
* added "-pipe" to CFLAGS to speed up build
2009-11-12 02:15:35 +00:00
|
|
|
@@ -4366,7 +4367,10 @@
|
|
|
|
#-------------------------------------------------------------------------------
|
|
|
|
|
|
|
|
# detect availability of float math.h functions
|
|
|
|
-if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/floatmath "floatmath" $L_FLAGS $I_FLAGS $l_FLAGS; then
|
|
|
|
+if [ "$XPLATFORM" = "win32-g++" ]; then
|
|
|
|
+ echo "Using FLOATMATH for win32-g++ target"
|
|
|
|
+ CFG_USE_FLOATMATH=yes
|
|
|
|
+elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/floatmath "floatmath" $L_FLAGS $I_FLAGS $l_FLAGS; then
|
|
|
|
CFG_USE_FLOATMATH=yes
|
|
|
|
else
|
|
|
|
CFG_USE_FLOATMATH=no
|
|
|
|
@@ -4374,7 +4378,10 @@
|
2009-11-08 21:43:41 +00:00
|
|
|
|
|
|
|
# detect mmx support
|
|
|
|
if [ "${CFG_MMX}" = "auto" ]; then
|
|
|
|
- if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/mmx "mmx" $L_FLAGS $I_FLAGS $l_FLAGS "-mmmx"; then
|
|
|
|
+ if [ "$XPLATFORM" = "win32-g++" ]; then
|
|
|
|
+ echo "Using MMX for win32-g++ target"
|
|
|
|
+ CFG_MMX=yes
|
|
|
|
+ elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/mmx "mmx" $L_FLAGS $I_FLAGS $l_FLAGS "-mmmx"; then
|
|
|
|
CFG_MMX=yes
|
|
|
|
else
|
|
|
|
CFG_MMX=no
|
several improvements to package qt (by Mark Brand)
* support for postgresql, tds and openssl
* fixed detection for float, zlib, libjpeg, libtiff, libmng,
libpng, postgresql, tds, sqlite, iconv,
STL, IPv6 and openssl
* added "-pipe" to CFLAGS to speed up build
2009-11-12 02:15:35 +00:00
|
|
|
@@ -4383,7 +4390,10 @@
|
2009-11-08 21:43:41 +00:00
|
|
|
|
|
|
|
# detect 3dnow support
|
|
|
|
if [ "${CFG_3DNOW}" = "auto" ]; then
|
|
|
|
- if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/3dnow "3dnow" $L_FLAGS $I_FLAGS $l_FLAGS "-m3dnow"; then
|
|
|
|
+ if [ "$XPLATFORM" = "win32-g++" ]; then
|
|
|
|
+ echo "Using SSE for win32-g++ target"
|
|
|
|
+ CFG_3DNOW=yes
|
|
|
|
+ elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/3dnow "3dnow" $L_FLAGS $I_FLAGS $l_FLAGS "-m3dnow"; then
|
|
|
|
CFG_3DNOW=yes
|
|
|
|
else
|
|
|
|
CFG_3DNOW=no
|
several improvements to package qt (by Mark Brand)
* support for postgresql, tds and openssl
* fixed detection for float, zlib, libjpeg, libtiff, libmng,
libpng, postgresql, tds, sqlite, iconv,
STL, IPv6 and openssl
* added "-pipe" to CFLAGS to speed up build
2009-11-12 02:15:35 +00:00
|
|
|
@@ -4392,7 +4402,10 @@
|
2009-11-08 21:43:41 +00:00
|
|
|
|
|
|
|
# detect sse support
|
|
|
|
if [ "${CFG_SSE}" = "auto" ]; then
|
|
|
|
- if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sse "sse" $L_FLAGS $I_FLAGS $l_FLAGS "-msse"; then
|
|
|
|
+ if [ "$XPLATFORM" = "win32-g++" ]; then
|
|
|
|
+ echo "Using SSE for win32-g++ target"
|
|
|
|
+ CFG_SSE=yes
|
|
|
|
+ elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sse "sse" $L_FLAGS $I_FLAGS $l_FLAGS "-msse"; then
|
|
|
|
CFG_SSE=yes
|
|
|
|
else
|
|
|
|
CFG_SSE=no
|
several improvements to package qt (by Mark Brand)
* support for postgresql, tds and openssl
* fixed detection for float, zlib, libjpeg, libtiff, libmng,
libpng, postgresql, tds, sqlite, iconv,
STL, IPv6 and openssl
* added "-pipe" to CFLAGS to speed up build
2009-11-12 02:15:35 +00:00
|
|
|
@@ -4401,13 +4414,26 @@
|
2009-11-08 21:43:41 +00:00
|
|
|
|
|
|
|
# detect sse2 support
|
|
|
|
if [ "${CFG_SSE2}" = "auto" ]; then
|
|
|
|
- if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sse2 "sse2" $L_FLAGS $I_FLAGS $l_FLAGS "-msse2"; then
|
|
|
|
+ if [ "$XPLATFORM" = "win32-g++" ]; then
|
|
|
|
+ echo "Using SSE2 for win32-g++ target"
|
|
|
|
+ CFG_SSE2=yes
|
|
|
|
+ elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sse2 "sse2" $L_FLAGS $I_FLAGS $l_FLAGS "-msse2"; then
|
|
|
|
CFG_SSE2=yes
|
|
|
|
else
|
|
|
|
CFG_SSE2=no
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
+# detect rtti support
|
|
|
|
+if [ "${CFG_RTTI}" = "auto" ]; then
|
|
|
|
+ if [ "$XPLATFORM" = "win32-g++" ]; then
|
|
|
|
+ echo "Using RTTI for win32-g++ target"
|
|
|
|
+ CFG_RTTI=yes
|
|
|
|
+ else
|
|
|
|
+ CFG_RTTI=no
|
|
|
|
+ fi
|
|
|
|
+fi
|
|
|
|
+
|
|
|
|
# check iWMMXt support
|
|
|
|
if [ "$CFG_IWMMXT" = "yes" ]; then
|
|
|
|
"$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/iwmmxt "iwmmxt" $L_FLAGS $I_FLAGS $l_FLAGS "-mcpu=iwmmxt"
|
several improvements to package qt (by Mark Brand)
* support for postgresql, tds and openssl
* fixed detection for float, zlib, libjpeg, libtiff, libmng,
libpng, postgresql, tds, sqlite, iconv,
STL, IPv6 and openssl
* added "-pipe" to CFLAGS to speed up build
2009-11-12 02:15:35 +00:00
|
|
|
@@ -4433,7 +4459,10 @@
|
|
|
|
ZLIB_FORCED=yes
|
|
|
|
fi
|
|
|
|
if [ "$CFG_ZLIB" = "auto" ]; then
|
|
|
|
- if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/zlib "zlib" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
|
|
|
|
+ if [ "$XPLATFORM" = "win32-g++" ]; then
|
|
|
|
+ echo "We cannot test for system ZLIB since we are cross building for win32-g++, so we assume it is there."
|
|
|
|
+ CFG_ZLIB=system
|
|
|
|
+ elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/zlib "zlib" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
|
|
|
|
CFG_ZLIB=system
|
|
|
|
else
|
|
|
|
CFG_ZLIB=yes
|
|
|
|
@@ -4450,7 +4479,10 @@
|
|
|
|
fi
|
|
|
|
# detect jpeg
|
|
|
|
if [ "$CFG_LIBJPEG" = "auto" ]; then
|
|
|
|
- if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libjpeg "libjpeg" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
|
|
|
|
+ if [ "$XPLATFORM" = "win32-g++" ]; then
|
|
|
|
+ echo "We cannot test for system LIBJPEG since we are cross building for win32-g++, so we assume it is there."
|
|
|
|
+ CFG_LIBJPEG=system
|
|
|
|
+ elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libjpeg "libjpeg" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
|
|
|
|
CFG_LIBJPEG=system
|
|
|
|
else
|
|
|
|
CFG_LIBJPEG=qt
|
|
|
|
@@ -4477,7 +4509,10 @@
|
|
|
|
|
|
|
|
# detect tiff
|
|
|
|
if [ "$CFG_LIBTIFF" = "auto" ]; then
|
|
|
|
- if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libtiff "libtiff" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
|
|
|
|
+ if [ "$XPLATFORM" = "win32-g++" ]; then
|
|
|
|
+ echo "We cannot test for system LIBTIFF since we are cross building for win32-g++, so we assume it is there."
|
|
|
|
+ CFG_LIBTIFF=system
|
|
|
|
+ elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libtiff "libtiff" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
|
|
|
|
CFG_LIBTIFF=system
|
|
|
|
else
|
|
|
|
CFG_LIBTIFF=qt
|
|
|
|
@@ -4494,7 +4529,10 @@
|
|
|
|
fi
|
|
|
|
# detect mng
|
|
|
|
if [ "$CFG_LIBMNG" = "auto" ]; then
|
|
|
|
- if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libmng "libmng" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
|
|
|
|
+ if [ "$XPLATFORM" = "win32-g++" ]; then
|
|
|
|
+ echo "We cannot test for system LIBMNG since we are cross building for win32-g++, so we assume it is there."
|
|
|
|
+ CFG_LIBMNG=system
|
|
|
|
+ elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libmng "libmng" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
|
|
|
|
CFG_LIBMNG=system
|
|
|
|
else
|
|
|
|
CFG_LIBMNG=qt
|
|
|
|
@@ -4503,7 +4541,10 @@
|
|
|
|
|
|
|
|
# detect png
|
|
|
|
if [ "$CFG_LIBPNG" = "auto" ]; then
|
|
|
|
- if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libpng "libpng" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
|
|
|
|
+ if [ "$XPLATFORM" = "win32-g++" ]; then
|
|
|
|
+ echo "We cannot test for system LIBPNG since we are cross building for win32-g++, so we assume it is there."
|
|
|
|
+ CFG_LIBPNG=system
|
|
|
|
+ elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libpng "libpng" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
|
|
|
|
CFG_LIBPNG=system
|
|
|
|
else
|
|
|
|
CFG_LIBPNG=qt
|
|
|
|
@@ -4570,7 +4611,10 @@
|
|
|
|
fi
|
|
|
|
;;
|
|
|
|
psql)
|
|
|
|
- if [ "$CFG_SQL_psql" != "no" ]; then
|
|
|
|
+ if [ "$XPLATFORM" = "win32-g++" ]; then
|
|
|
|
+ echo "We cannot test for PostgreSQL support since we are cross building for win32-g++, so we assume it is there."
|
|
|
|
+ CFG_SQL_psql=plugin
|
|
|
|
+ elif [ "$CFG_SQL_psql" != "no" ]; then
|
|
|
|
if "$WHICH" pg_config >/dev/null 2>&1; then
|
|
|
|
QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null`
|
|
|
|
QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null`
|
|
|
|
@@ -4598,7 +4642,10 @@
|
2009-10-28 12:37:52 +00:00
|
|
|
;;
|
|
|
|
odbc)
|
|
|
|
if [ "$CFG_SQL_odbc" != "no" ]; then
|
|
|
|
- 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
|
|
|
|
+ if [ "$XPLATFORM" = "win32-g++" ]; then
|
|
|
|
+ echo "We cannot test for ODBC support since we are cross building for win32-g++, so we assume it is there."
|
|
|
|
+ CFG_SQL_odbc=plugin
|
|
|
|
+ elif [ "$PLATFORM_MAC" != "yes" ] && "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/odbc "ODBC" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
|
|
|
|
if [ "$CFG_SQL_odbc" = "auto" ]; then
|
|
|
|
CFG_SQL_odbc=plugin
|
|
|
|
fi
|
several improvements to package qt (by Mark Brand)
* support for postgresql, tds and openssl
* fixed detection for float, zlib, libjpeg, libtiff, libmng,
libpng, postgresql, tds, sqlite, iconv,
STL, IPv6 and openssl
* added "-pipe" to CFLAGS to speed up build
2009-11-12 02:15:35 +00:00
|
|
|
@@ -4643,7 +4690,12 @@
|
|
|
|
;;
|
|
|
|
tds)
|
|
|
|
if [ "$CFG_SQL_tds" != "no" ]; then
|
|
|
|
- if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/tds "TDS" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
|
|
|
|
+ if [ "$XPLATFORM" = "win32-g++" ]; then
|
|
|
|
+ echo "We cannot test for TDS since we are cross building for win32-g++, so we assume it is there."
|
|
|
|
+ if [ "CFG_SQL_tds" = "auto" ]; then
|
|
|
|
+ CFG_SQL_tds=plugin
|
|
|
|
+ fi
|
|
|
|
+ elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/tds "TDS" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
|
|
|
|
if [ "$CFG_SQL_tds" = "auto" ]; then
|
|
|
|
CFG_SQL_tds=plugin
|
|
|
|
fi
|
|
|
|
@@ -4725,7 +4777,13 @@
|
|
|
|
QT_CFLAGS_SQLITE=`$PKG_CONFIG --cflags sqlite3 2>/dev/null`
|
|
|
|
QT_LFLAGS_SQLITE=`$PKG_CONFIG --libs sqlite3 2>/dev/null`
|
|
|
|
fi
|
|
|
|
- if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sqlite "SQLite" $QT_LFLAGS_SQLITE $L_FLAGS $QT_CFLAGS_SQLITE $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
|
|
|
|
+ if [ "$XPLATFORM" = "win32-g++" ]; then
|
|
|
|
+ echo "We cannot test for system sqlite since we are cross building for win32-g++, so we assume it is there."
|
|
|
|
+ if [ "$CFG_SQL_sqlite" = "auto" ]; then
|
|
|
|
+ CFG_SQL_sqlite=plugin
|
|
|
|
+ fi
|
|
|
|
+ QMAKE_CONFIG="$QMAKE_CONFIG system-sqlite"
|
|
|
|
+ elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sqlite "SQLite" $QT_LFLAGS_SQLITE $L_FLAGS $QT_CFLAGS_SQLITE $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
|
|
|
|
if [ "$CFG_SQL_sqlite" = "auto" ]; then
|
|
|
|
CFG_SQL_sqlite=plugin
|
|
|
|
fi
|
|
|
|
@@ -4796,7 +4854,9 @@
|
|
|
|
|
|
|
|
# auto-detect iconv(3) support
|
|
|
|
if [ "$CFG_ICONV" != "no" ]; then
|
|
|
|
- if [ "$PLATFORM_QWS" = "yes" ]; then
|
|
|
|
+ if [ "$XPLATFORM" = "win32-g++" ]; then
|
|
|
|
+ CFG_ICONV=no
|
|
|
|
+ elif [ "$PLATFORM_QWS" = "yes" ]; then
|
|
|
|
CFG_ICONV=no
|
|
|
|
elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" "$OPT_VERBOSE" "$relpath" "$outpath" "config.tests/unix/iconv" "POSIX iconv" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
|
|
|
|
CFG_ICONV=yes
|
|
|
|
@@ -4956,7 +5016,9 @@
|
2009-10-03 20:11:16 +01:00
|
|
|
echo "Basic XLib functionality test failed!"
|
|
|
|
echo " You might need to modify the include and library search paths by editing"
|
|
|
|
echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}."
|
|
|
|
- exit 1
|
|
|
|
+echo NOTICE: This is a specially modifed configure script!
|
2009-10-06 13:08:28 +01:00
|
|
|
+echo For our purposes we do not want X11.
|
2009-10-03 20:11:16 +01:00
|
|
|
+# exit 1
|
|
|
|
fi
|
|
|
|
|
|
|
|
# auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x)
|
several improvements to package qt (by Mark Brand)
* support for postgresql, tds and openssl
* fixed detection for float, zlib, libjpeg, libtiff, libmng,
libpng, postgresql, tds, sqlite, iconv,
STL, IPv6 and openssl
* added "-pipe" to CFLAGS to speed up build
2009-11-12 02:15:35 +00:00
|
|
|
@@ -5030,7 +5092,9 @@
|
2009-10-06 11:17:40 +01:00
|
|
|
echo " You might need to modify the include and library search paths by editing"
|
|
|
|
echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in"
|
|
|
|
echo " ${XQMAKESPEC}."
|
|
|
|
- exit 1
|
|
|
|
+echo NOTICE: This is a specially modifed configure script!
|
|
|
|
+echo For our purposes we do not want the OpenGL functionality test.
|
|
|
|
+# exit 1
|
|
|
|
fi
|
|
|
|
case "$PLATFORM" in
|
|
|
|
hpux*)
|
several improvements to package qt (by Mark Brand)
* support for postgresql, tds and openssl
* fixed detection for float, zlib, libjpeg, libtiff, libmng,
libpng, postgresql, tds, sqlite, iconv,
STL, IPv6 and openssl
* added "-pipe" to CFLAGS to speed up build
2009-11-12 02:15:35 +00:00
|
|
|
@@ -5531,7 +5595,10 @@
|
|
|
|
fi
|
|
|
|
|
|
|
|
HAVE_STL=no
|
|
|
|
-if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/stl "STL" $L_FLAGS $I_FLAGS $l_FLAGS; then
|
|
|
|
+if [ "$XPLATFORM" = "win32-g++" ]; then
|
|
|
|
+ echo "Using STL for win32-g++ target"
|
|
|
|
+ HAVE_STL=yes
|
|
|
|
+elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/stl "STL" $L_FLAGS $I_FLAGS $l_FLAGS; then
|
|
|
|
HAVE_STL=yes
|
|
|
|
fi
|
|
|
|
|
|
|
|
@@ -5553,7 +5620,10 @@
|
|
|
|
|
|
|
|
# find if the platform supports IPv6
|
|
|
|
if [ "$CFG_IPV6" != "no" ]; then
|
|
|
|
- if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/ipv6 "IPv6" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
|
|
|
|
+ if [ "$XPLATFORM" = "win32-g++" ]; then
|
|
|
|
+ echo "Using IPV6 for win32-g++ target"
|
|
|
|
+ CFG_IPV6=yes
|
|
|
|
+ elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/ipv6 "IPv6" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
|
|
|
|
CFG_IPV6=yes
|
|
|
|
else
|
|
|
|
if [ "$CFG_IPV6" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
|
|
|
|
@@ -5684,7 +5754,9 @@
|
|
|
|
|
|
|
|
# detect OpenSSL
|
|
|
|
if [ "$CFG_OPENSSL" != "no" ]; then
|
|
|
|
- if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/openssl "OpenSSL" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
|
|
|
|
+ if [ "$XPLATFORM" = "win32-g++" ]; then
|
|
|
|
+ echo "We cannot test for system CFG_OPENSSL since we are cross building for win32-g++, so we assume it is there."
|
|
|
|
+ elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/openssl "OpenSSL" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
|
|
|
|
if [ "$CFG_OPENSSL" = "auto" ]; then
|
|
|
|
CFG_OPENSSL=yes
|
|
|
|
fi
|
|
|
|
@@ -6016,6 +6088,7 @@
|
2009-11-08 21:43:41 +00:00
|
|
|
[ "$CFG_3DNOW" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG 3dnow"
|
|
|
|
[ "$CFG_SSE" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG sse"
|
|
|
|
[ "$CFG_SSE2" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG sse2"
|
|
|
|
+[ "$CFG_RTTI" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG rtti"
|
|
|
|
[ "$CFG_IWMMXT" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG iwmmxt"
|
|
|
|
[ "$PLATFORM_MAC" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG $CFG_MAC_ARCHS"
|
|
|
|
if [ "$CFG_IPV6" = "yes" ]; then
|
several improvements to package qt (by Mark Brand)
* support for postgresql, tds and openssl
* fixed detection for float, zlib, libjpeg, libtiff, libmng,
libpng, postgresql, tds, sqlite, iconv,
STL, IPv6 and openssl
* added "-pipe" to CFLAGS to speed up build
2009-11-12 02:15:35 +00:00
|
|
|
@@ -6096,11 +6169,12 @@
|
2009-10-10 21:46:11 +01:00
|
|
|
QT_CONFIG="$QT_CONFIG freetype"
|
|
|
|
fi
|
|
|
|
|
|
|
|
-if [ "x$PLATFORM_MAC" = "xyes" ]; then
|
|
|
|
- #On Mac we implicitly link against libz, so we
|
|
|
|
- #never use the 3rdparty stuff.
|
|
|
|
- [ "$CFG_ZLIB" = "yes" ] && CFG_ZLIB="system"
|
|
|
|
-fi
|
|
|
|
+# We're cross compiling, so we respect the user setting.
|
|
|
|
+#if [ "x$PLATFORM_MAC" = "xyes" ]; then
|
|
|
|
+# #On Mac we implicitly link against libz, so we
|
|
|
|
+# #never use the 3rdparty stuff.
|
|
|
|
+# [ "$CFG_ZLIB" = "yes" ] && CFG_ZLIB="system"
|
|
|
|
+#fi
|
|
|
|
if [ "$CFG_ZLIB" = "yes" ]; then
|
|
|
|
QT_CONFIG="$QT_CONFIG zlib"
|
|
|
|
elif [ "$CFG_ZLIB" = "system" ]; then
|
several improvements to package qt (by Mark Brand)
* support for postgresql, tds and openssl
* fixed detection for float, zlib, libjpeg, libtiff, libmng,
libpng, postgresql, tds, sqlite, iconv,
STL, IPv6 and openssl
* added "-pipe" to CFLAGS to speed up build
2009-11-12 02:15:35 +00:00
|
|
|
@@ -7025,7 +7099,7 @@
|
2009-11-08 21:43:41 +00:00
|
|
|
|
|
|
|
cat >>"$QTCONFIG.tmp" <<EOF
|
|
|
|
#configuration
|
|
|
|
-CONFIG += $QTCONFIG_CONFIG
|
|
|
|
+CONFIG += $QMAKE_CONFIG $QTCONFIG_CONFIG
|
|
|
|
QT_ARCH = $CFG_ARCH
|
|
|
|
QT_EDITION = $Edition
|
|
|
|
QT_CONFIG += $QT_CONFIG
|
several improvements to package qt (by Mark Brand)
* support for postgresql, tds and openssl
* fixed detection for float, zlib, libjpeg, libtiff, libmng,
libpng, postgresql, tds, sqlite, iconv,
STL, IPv6 and openssl
* added "-pipe" to CFLAGS to speed up build
2009-11-12 02:15:35 +00:00
|
|
|
@@ -7117,7 +7191,7 @@
|
|
|
|
if [ '!' -z "$OPENSSL_LIBS" ]; then
|
|
|
|
echo "OPENSSL_LIBS = $OPENSSL_LIBS" >> "$CACHEFILE.tmp"
|
|
|
|
elif [ "$CFG_OPENSSL" = "linked" ]; then
|
|
|
|
- echo "OPENSSL_LIBS = -lssl -lcrypto" >> "$CACHEFILE.tmp"
|
|
|
|
+ echo "OPENSSL_LIBS = `$PKG_CONFIG --libs openssl`" >> "$CACHEFILE.tmp"
|
|
|
|
fi
|
|
|
|
|
|
|
|
#dump in the SDK info
|
|
|
|
@@ -7297,7 +7371,7 @@
|
2009-11-08 21:43:41 +00:00
|
|
|
fi
|
|
|
|
echo "STL support ......... $CFG_STL"
|
|
|
|
echo "PCH support ......... $CFG_PRECOMPILE"
|
|
|
|
-echo "MMX/3DNOW/SSE/SSE2.. ${CFG_MMX}/${CFG_3DNOW}/${CFG_SSE}/${CFG_SSE2}"
|
|
|
|
+echo "MMX/3DNOW/SSE/SSE2/RTTI.. ${CFG_MMX}/${CFG_3DNOW}/${CFG_SSE}/${CFG_SSE2}/${CFG_RTTI}"
|
|
|
|
if [ "${CFG_ARCH}" = "arm" ]; then
|
|
|
|
echo "iWMMXt support ...... ${CFG_IWMMXT}"
|
|
|
|
fi
|
several improvements to package qt (by Mark Brand)
* support for postgresql, tds and openssl
* fixed detection for float, zlib, libjpeg, libtiff, libmng,
libpng, postgresql, tds, sqlite, iconv,
STL, IPv6 and openssl
* added "-pipe" to CFLAGS to speed up build
2009-11-12 02:15:35 +00:00
|
|
|
@@ -7610,7 +7684,11 @@
|
2009-10-03 20:11:16 +01:00
|
|
|
[ "$IN_ROOT" = "no" ] && continue
|
|
|
|
|
|
|
|
case $a in
|
|
|
|
- *winmain/winmain.pro) continue ;;
|
2009-10-10 02:30:45 +01:00
|
|
|
+ *winmain/winmain.pro)
|
|
|
|
+ case "$XPLATFORM" in
|
|
|
|
+ win32*) SPEC=$XQMAKESPEC ;;
|
|
|
|
+ *) continue ;;
|
|
|
|
+ esac ;;
|
2009-10-03 20:11:16 +01:00
|
|
|
*s60main/s60main.pro) continue ;;
|
|
|
|
*/qmake/qmake.pro) continue ;;
|
|
|
|
*tools/bootstrap*|*tools/moc*|*tools/rcc*|*tools/uic*) SPEC=$QMAKESPEC ;;
|
several improvements to package qt (by Mark Brand)
* support for postgresql, tds and openssl
* fixed detection for float, zlib, libjpeg, libtiff, libmng,
libpng, postgresql, tds, sqlite, iconv,
STL, IPv6 and openssl
* added "-pipe" to CFLAGS to speed up build
2009-11-12 02:15:35 +00:00
|
|
|
--- a/mkspecs/win32-g++/qmake.conf 2009-10-13 17:34:08.000000000 +0200
|
|
|
|
+++ b/mkspecs/win32-g++/qmake.conf 2009-11-11 23:30:46.000000000 +0100
|
|
|
|
@@ -3,23 +3,31 @@
|
2009-10-03 20:11:16 +01:00
|
|
|
#
|
|
|
|
# Written for MinGW
|
|
|
|
#
|
|
|
|
+load(qt_config)
|
|
|
|
|
|
|
|
MAKEFILE_GENERATOR = MINGW
|
|
|
|
TEMPLATE = app
|
|
|
|
CONFIG += qt warn_on release link_prl copy_dir_files debug_and_release debug_and_release_target precompile_header
|
2009-10-04 21:00:37 +01:00
|
|
|
+CONFIG += windows win32
|
2009-10-03 20:11:16 +01:00
|
|
|
+CONFIG -= freetype
|
|
|
|
+QT_CONFIG -= freetype
|
|
|
|
QT += core gui
|
|
|
|
DEFINES += UNICODE QT_LARGEFILE_SUPPORT
|
|
|
|
+DEFINES -= QT_LARGEFILE_SUPPORT
|
|
|
|
+DEFINES += QT_TABLET QT_SESSIONMANAGER QT_NO_DIRECT3D QT_NO_CODECS
|
|
|
|
QMAKE_COMPILER_DEFINES += __GNUC__ WIN32
|
|
|
|
|
|
|
|
QMAKE_EXT_OBJ = .o
|
|
|
|
QMAKE_EXT_RES = _res.o
|
|
|
|
|
|
|
|
-QMAKE_CC = gcc
|
|
|
|
+QMAKE_CC = HOSTPLATFORMPREFIX-gcc
|
|
|
|
QMAKE_LEX = flex
|
|
|
|
QMAKE_LEXFLAGS =
|
|
|
|
QMAKE_YACC = byacc
|
|
|
|
QMAKE_YACCFLAGS = -d
|
|
|
|
QMAKE_CFLAGS =
|
|
|
|
+QMAKE_CFLAGS += -isystem HOSTPLATFORMINCLUDE
|
several improvements to package qt (by Mark Brand)
* support for postgresql, tds and openssl
* fixed detection for float, zlib, libjpeg, libtiff, libmng,
libpng, postgresql, tds, sqlite, iconv,
STL, IPv6 and openssl
* added "-pipe" to CFLAGS to speed up build
2009-11-12 02:15:35 +00:00
|
|
|
+QMAKE_CFLAGS += -pipe
|
2009-10-03 20:11:16 +01:00
|
|
|
QMAKE_CFLAGS_DEPS = -M
|
|
|
|
QMAKE_CFLAGS_WARN_ON = -Wall
|
|
|
|
QMAKE_CFLAGS_WARN_OFF = -w
|
several improvements to package qt (by Mark Brand)
* support for postgresql, tds and openssl
* fixed detection for float, zlib, libjpeg, libtiff, libmng,
libpng, postgresql, tds, sqlite, iconv,
STL, IPv6 and openssl
* added "-pipe" to CFLAGS to speed up build
2009-11-12 02:15:35 +00:00
|
|
|
@@ -27,7 +35,7 @@
|
2009-10-03 20:11:16 +01:00
|
|
|
QMAKE_CFLAGS_DEBUG = -g
|
|
|
|
QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses
|
|
|
|
|
|
|
|
-QMAKE_CXX = g++
|
|
|
|
+QMAKE_CXX = HOSTPLATFORMPREFIX-g++
|
|
|
|
QMAKE_CXXFLAGS = $$QMAKE_CFLAGS
|
|
|
|
QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS
|
|
|
|
QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
|
several improvements to package qt (by Mark Brand)
* support for postgresql, tds and openssl
* fixed detection for float, zlib, libjpeg, libtiff, libmng,
libpng, postgresql, tds, sqlite, iconv,
STL, IPv6 and openssl
* added "-pipe" to CFLAGS to speed up build
2009-11-12 02:15:35 +00:00
|
|
|
@@ -42,6 +50,7 @@
|
2009-10-03 20:11:16 +01:00
|
|
|
QMAKE_CXXFLAGS_EXCEPTIONS_OFF = -fno-exceptions
|
|
|
|
|
|
|
|
QMAKE_INCDIR =
|
|
|
|
+QMAKE_INCDIR += .
|
|
|
|
QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS]
|
|
|
|
QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS]
|
|
|
|
|
several improvements to package qt (by Mark Brand)
* support for postgresql, tds and openssl
* fixed detection for float, zlib, libjpeg, libtiff, libmng,
libpng, postgresql, tds, sqlite, iconv,
STL, IPv6 and openssl
* added "-pipe" to CFLAGS to speed up build
2009-11-12 02:15:35 +00:00
|
|
|
@@ -50,8 +59,8 @@
|
2009-10-03 20:11:16 +01:00
|
|
|
QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src
|
|
|
|
QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
|
|
|
|
|
|
|
|
-QMAKE_LINK = g++
|
|
|
|
-QMAKE_LINK_C = gcc
|
|
|
|
+QMAKE_LINK = HOSTPLATFORMPREFIX-g++
|
|
|
|
+QMAKE_LINK_C = HOSTPLATFORMPREFIX-gcc
|
|
|
|
QMAKE_LFLAGS = -enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc
|
|
|
|
QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads -Wl
|
|
|
|
QMAKE_LFLAGS_EXCEPTIONS_OFF =
|
several improvements to package qt (by Mark Brand)
* support for postgresql, tds and openssl
* fixed detection for float, zlib, libjpeg, libtiff, libmng,
libpng, postgresql, tds, sqlite, iconv,
STL, IPv6 and openssl
* added "-pipe" to CFLAGS to speed up build
2009-11-12 02:15:35 +00:00
|
|
|
@@ -72,15 +81,18 @@
|
2009-10-03 20:11:16 +01:00
|
|
|
QMAKE_LIBS_COMPAT = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32
|
|
|
|
QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain
|
|
|
|
|
|
|
|
+QMAKE_SH = bash
|
|
|
|
+
|
|
|
|
!isEmpty(QMAKE_SH) {
|
|
|
|
MINGW_IN_SHELL = 1
|
|
|
|
QMAKE_DIR_SEP = /
|
|
|
|
QMAKE_COPY = cp
|
|
|
|
- QMAKE_COPY_DIR = xcopy /s /q /y /i
|
|
|
|
+ QMAKE_COPY_DIR = cp -r
|
|
|
|
QMAKE_MOVE = mv
|
|
|
|
QMAKE_DEL_FILE = rm
|
|
|
|
- QMAKE_MKDIR = mkdir
|
|
|
|
+ QMAKE_MKDIR = mkdir -p
|
|
|
|
QMAKE_DEL_DIR = rmdir
|
|
|
|
+ QMAKE_SYMBOLIC_LINK = ln -s
|
|
|
|
QMAKE_CHK_DIR_EXISTS = test -d
|
|
|
|
} else {
|
|
|
|
QMAKE_COPY = copy /y
|
several improvements to package qt (by Mark Brand)
* support for postgresql, tds and openssl
* fixed detection for float, zlib, libjpeg, libtiff, libmng,
libpng, postgresql, tds, sqlite, iconv,
STL, IPv6 and openssl
* added "-pipe" to CFLAGS to speed up build
2009-11-12 02:15:35 +00:00
|
|
|
@@ -92,15 +104,16 @@
|
2009-10-03 20:11:16 +01:00
|
|
|
QMAKE_CHK_DIR_EXISTS = if not exist
|
|
|
|
}
|
|
|
|
|
|
|
|
-QMAKE_MOC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}moc.exe
|
|
|
|
-QMAKE_UIC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}uic.exe
|
|
|
|
-QMAKE_IDC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}idc.exe
|
|
|
|
-
|
|
|
|
-QMAKE_IDL = midl
|
|
|
|
-QMAKE_LIB = ar -ru
|
|
|
|
-QMAKE_RC = windres
|
2009-10-04 02:29:37 +01:00
|
|
|
+#QMAKE_IDC = HOSTPLATFORMPREFIX-idc
|
|
|
|
+QMAKE_MOC = HOSTPLATFORMPREFIX-moc
|
|
|
|
+QMAKE_RCC = HOSTPLATFORMPREFIX-rcc
|
|
|
|
+QMAKE_UIC = HOSTPLATFORMPREFIX-uic
|
2009-10-03 20:11:16 +01:00
|
|
|
+
|
|
|
|
+#QMAKE_IDL = midl
|
|
|
|
+QMAKE_LIB = HOSTPLATFORMPREFIX-ar -ru
|
|
|
|
+QMAKE_RC = HOSTPLATFORMPREFIX-windres
|
|
|
|
QMAKE_ZIP = zip -r -9
|
|
|
|
|
|
|
|
-QMAKE_STRIP = strip
|
|
|
|
+QMAKE_STRIP = HOSTPLATFORMPREFIX-strip
|
|
|
|
QMAKE_STRIPFLAGS_LIB += --strip-unneeded
|
|
|
|
-load(qt_config)
|
several improvements to package qt (by Mark Brand)
* support for postgresql, tds and openssl
* fixed detection for float, zlib, libjpeg, libtiff, libmng,
libpng, postgresql, tds, sqlite, iconv,
STL, IPv6 and openssl
* added "-pipe" to CFLAGS to speed up build
2009-11-12 02:15:35 +00:00
|
|
|
+PKG_CONFIG = HOSTPLATFORMPREFIX-pkg-config
|
|
|
|
--- qt-everywhere-opensource-src-4.6.0-beta1.native/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pro 2009-10-13 17:34:08.000000000 +0200
|
|
|
|
+++ qt-everywhere-opensource-src-4.6.0-beta1/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pro 2009-10-25 13:17:35.000000000 +0100
|
|
|
|
@@ -16,7 +16,7 @@
|
|
|
|
include($$QT_SOURCE_TREE/src/qbase.pri)
|
|
|
|
INSTALLS =
|
|
|
|
DESTDIR = $$OLDDESTDIR
|
|
|
|
- PRECOMPILED_HEADER = $$PWD/../WebKit/qt/WebKit_pch.h
|
|
|
|
+ PRECOMPILED_HEADER = $$PWD/../../webkit/WebKit/qt/WebKit_pch.h
|
|
|
|
DEFINES *= NDEBUG
|
|
|
|
}
|
|
|
|
|
2009-10-27 16:54:54 +00:00
|
|
|
--- qt-everywhere-opensource-src-4.6.0-beta1.native/src/3rdparty/webkit/JavaScriptCore/jsc.pro 2009-10-13 17:34:08.000000000 +0200
|
|
|
|
+++ qt-everywhere-opensource-src-4.6.0-beta1/src/3rdparty/webkit/JavaScriptCore/jsc.pro 2009-10-25 20:23:25.000000000 +0100
|
|
|
|
@@ -20,6 +20,13 @@
|
|
|
|
} else { # Release
|
|
|
|
OBJECTS_DIR = obj/release
|
|
|
|
}
|
|
|
|
+
|
|
|
|
+# MAB: Added by analogy to JavaScriptCore.pro and WebCore.pro
|
|
|
|
+# JavaScriptCore.pri needs to know path for generated sources
|
|
|
|
+isEmpty(GENERATED_SOURCES_DIR):GENERATED_SOURCES_DIR = generated
|
|
|
|
+GENERATED_SOURCES_DIR_SLASH = $${GENERATED_SOURCES_DIR}$${QMAKE_DIR_SEP}
|
|
|
|
+
|
|
|
|
+INCLUDEPATH += $$GENERATED_SOURCES_DIR
|
|
|
|
OBJECTS_DIR_WTR = $$OBJECTS_DIR$${QMAKE_DIR_SEP}
|
|
|
|
include($$PWD/JavaScriptCore.pri)
|
|
|
|
|
|
|
|
--- qt-everywhere-opensource-src-4.6.0-beta1.native/src/3rdparty/webkit/WebKit/qt/Plugins/Plugins.pro 2009-10-13 17:34:08.000000000 +0200
|
|
|
|
+++ qt-everywhere-opensource-src-4.6.0-beta1/src/3rdparty/webkit/WebKit/qt/Plugins/Plugins.pro 2009-10-25 21:08:46.000000000 +0100
|
|
|
|
@@ -4,7 +4,7 @@
|
|
|
|
HEADERS += ICOHandler.h
|
|
|
|
SOURCES += ICOHandler.cpp
|
|
|
|
|
|
|
|
-include(../../WebKit.pri)
|
|
|
|
+include(../../../WebKit.pri)
|
|
|
|
|
|
|
|
contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
|
|
|
|
unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions
|
several improvements to package qt (by Mark Brand)
* support for postgresql, tds and openssl
* fixed detection for float, zlib, libjpeg, libtiff, libmng,
libpng, postgresql, tds, sqlite, iconv,
STL, IPv6 and openssl
* added "-pipe" to CFLAGS to speed up build
2009-11-12 02:15:35 +00:00
|
|
|
--- qt-everywhere-opensource-src-4.6.0-beta1.native/src/plugins/sqldrivers/tds/main.cpp 2009-10-13 17:34:08.000000000 +0200
|
|
|
|
+++ qt-everywhere-opensource-src-4.6.0-beta1/src/plugins/sqldrivers/tds/main.cpp 2009-10-31 21:37:19.000000000 +0100
|
|
|
|
@@ -47,6 +47,7 @@
|
|
|
|
#define _WINSCARD_H_
|
|
|
|
#include <windows.h>
|
|
|
|
#endif
|
|
|
|
+#define Q_USE_SYBASE
|
|
|
|
#include "../../../sql/drivers/tds/qsql_tds.h"
|
|
|
|
|
|
|
|
QT_BEGIN_NAMESPACE
|
|
|
|
--- qt-everywhere-opensource-src-4.6.0-beta1.native/src/plugins/sqldrivers/tds/tds.pro 2009-10-13 17:34:08.000000000 +0200
|
|
|
|
+++ qt-everywhere-opensource-src-4.6.0-beta1/src/plugins/sqldrivers/tds/tds.pro 2009-11-01 22:31:16.000000000 +0100
|
|
|
|
@@ -5,11 +5,6 @@
|
|
|
|
SOURCES = main.cpp \
|
|
|
|
../../../sql/drivers/tds/qsql_tds.cpp
|
|
|
|
|
|
|
|
-unix:!contains( LIBS, .*sybdb.* ):LIBS *= -lsybdb
|
|
|
|
-
|
|
|
|
-win32 {
|
|
|
|
- !win32-borland:LIBS *= -lNTWDBLIB
|
|
|
|
- win32-borland:LIBS *= $(BCB)/lib/PSDK/NTWDBLIB.LIB
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
+#Patched to use FreeTDS targetting MinGW
|
|
|
|
+LIBS *= -lsybdb -liconv -lws2_32
|
|
|
|
include(../qsqldriverbase.pri)
|
|
|
|
--- a/src/sql/drivers/tds/qsql_tds.cpp 2009-10-13 17:34:08.000000000 +0200
|
|
|
|
+++ b/src/sql/drivers/tds/qsql_tds.cpp 2009-11-11 14:45:10.000000000 +0100
|
|
|
|
@@ -47,7 +47,8 @@
|
|
|
|
#else
|
|
|
|
#define Q_USE_SYBASE
|
|
|
|
#endif
|
|
|
|
-
|
|
|
|
+//Force SYBASE because we use FreeTDS
|
|
|
|
+#define Q_USE_SYBASE
|
|
|
|
#include "qsql_tds.h"
|
|
|
|
|
|
|
|
#include <qvariant.h>
|
|
|
|
@@ -164,13 +165,13 @@
|
|
|
|
|
|
|
|
extern "C" {
|
|
|
|
static int CS_PUBLIC qTdsMsgHandler (DBPROCESS* dbproc,
|
|
|
|
- DBINT /*msgno*/,
|
|
|
|
+ DBINT msgno,
|
|
|
|
int msgstate,
|
|
|
|
int severity,
|
|
|
|
char* msgtext,
|
|
|
|
- char* /*srvname*/,
|
|
|
|
+ char* srvname,
|
|
|
|
char* /*procname*/,
|
|
|
|
- int /*line*/)
|
|
|
|
+ int line)
|
|
|
|
{
|
|
|
|
QTDSResultPrivate* p = errs()->value(dbproc);
|
|
|
|
|
|
|
|
@@ -181,9 +182,20 @@
|
|
|
|
}
|
|
|
|
|
|
|
|
if (severity > 0) {
|
|
|
|
- QString errMsg = QString::fromLatin1("%1 (%2)").arg(QString::fromAscii(msgtext)).arg(
|
|
|
|
- msgstate);
|
|
|
|
+ QString errMsg = QString::fromLatin1("%1 (Msg %2, Level %3, State %4, Server %5, Line %6)")
|
|
|
|
+ .arg(QString::fromAscii(msgtext))
|
|
|
|
+ .arg(msgno)
|
|
|
|
+ .arg(severity)
|
|
|
|
+ .arg(msgstate)
|
|
|
|
+ .arg(QString::fromAscii(srvname))
|
|
|
|
+ .arg(line);
|
|
|
|
p->addErrorMsg(errMsg);
|
|
|
|
+ if (severity > 10) {
|
|
|
|
+ // Severe messages are really errors in the sense of lastError
|
|
|
|
+ errMsg = p->getErrorMsgs();
|
|
|
|
+ p->lastError = qMakeError(errMsg, QSqlError::UnknownError, msgno);
|
|
|
|
+ p->clearErrorMsgs();
|
|
|
|
+ }
|
|
|
|
}
|
|
|
|
|
|
|
|
return INT_CANCEL;
|
|
|
|
--- qt-everywhere-opensource-src-4.6.0-beta1.native/src/sql/drivers/tds/qsql_tds.h 2009-10-13 17:34:08.000000000 +0200
|
|
|
|
+++ qt-everywhere-opensource-src-4.6.0-beta1/src/sql/drivers/tds/qsql_tds.h 2009-10-31 21:48:13.000000000 +0100
|
|
|
|
@@ -48,7 +48,8 @@
|
|
|
|
|
|
|
|
#ifdef Q_OS_WIN32
|
|
|
|
#define WIN32_LEAN_AND_MEAN
|
|
|
|
-#define DBNTWIN32 // indicates 32bit windows dblib
|
|
|
|
+//#define DBNTWIN32 // indicates 32bit windows dblib
|
|
|
|
+#include <winsock2.h>
|
|
|
|
#include <QtCore/qt_windows.h>
|
|
|
|
#include <sqlfront.h>
|
|
|
|
#include <sqldb.h>
|
|
|
|
diff -urN a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri
|
|
|
|
--- a/src/corelib/tools/tools.pri 2009-10-13 17:34:08.000000000 +0200
|
|
|
|
+++ b/src/corelib/tools/tools.pri 2009-11-11 21:50:19.000000000 +0100
|
|
|
|
@@ -96,7 +96,7 @@
|
|
|
|
../3rdparty/zlib/zutil.c
|
|
|
|
} else:!contains(QT_CONFIG, no-zlib) {
|
|
|
|
unix:LIBS_PRIVATE += -lz
|
|
|
|
-# win32:LIBS += libz.lib
|
|
|
|
+ win32:LIBS += -lz
|
2009-10-27 16:54:54 +00:00
|
|
|
}
|
|
|
|
|
several improvements to package qt (by Mark Brand)
* support for postgresql, tds and openssl
* fixed detection for float, zlib, libjpeg, libtiff, libmng,
libpng, postgresql, tds, sqlite, iconv,
STL, IPv6 and openssl
* added "-pipe" to CFLAGS to speed up build
2009-11-12 02:15:35 +00:00
|
|
|
DEFINES += HB_EXPORT=Q_CORE_EXPORT
|
|
|
|
diff -urN a/src/gui/image/image.pri b/src/gui/image/image.pri
|
|
|
|
--- a/src/gui/image/image.pri 2009-10-13 17:34:08.000000000 +0200
|
|
|
|
+++ b/src/gui/image/image.pri 2009-11-11 22:27:26.000000000 +0100
|
|
|
|
@@ -94,7 +94,10 @@
|
|
|
|
|
|
|
|
contains(QT_CONFIG, system-png) {
|
|
|
|
unix:LIBS_PRIVATE += -lpng
|
|
|
|
- win32:LIBS += libpng.lib
|
|
|
|
+ win32:LIBS += -lpng
|
|
|
|
+ contains(QT_CONFIG, system-zlib) {
|
|
|
|
+ win32:LIBS += -lz
|
|
|
|
+ }
|
|
|
|
} else {
|
|
|
|
!isEqual(QT_ARCH, i386):!isEqual(QT_ARCH, x86_64):DEFINES += PNG_NO_ASSEMBLER_CODE
|
|
|
|
INCLUDEPATH += ../3rdparty/libpng ../3rdparty/zlib
|
|
|
|
diff -urN a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri
|
|
|
|
--- a/src/gui/painting/painting.pri 2009-10-13 17:34:08.000000000 +0200
|
|
|
|
+++ b/src/gui/painting/painting.pri 2009-11-11 22:28:30.000000000 +0100
|
|
|
|
@@ -384,6 +384,6 @@
|
|
|
|
INCLUDEPATH += ../3rdparty/zlib
|
|
|
|
} else:!contains(QT_CONFIG, no-zlib) {
|
|
|
|
unix:LIBS_PRIVATE += -lz
|
|
|
|
-# win32:LIBS += libz.lib
|
|
|
|
+ win32:LIBS += -lz
|
|
|
|
}
|
|
|
|
|
|
|
|
diff -urN a/src/svg/svg.pro b/src/svg/svg.pro
|
|
|
|
--- a/src/svg/svg.pro 2009-10-13 17:34:08.000000000 +0200
|
|
|
|
+++ b/src/svg/svg.pro 2009-11-11 21:45:17.000000000 +0100
|
|
|
|
@@ -47,4 +47,5 @@
|
|
|
|
INCLUDEPATH += ../3rdparty/zlib
|
|
|
|
} else:!contains(QT_CONFIG, no-zlib) {
|
|
|
|
unix:LIBS_PRIVATE += -lz
|
|
|
|
+ win32:LIBS += -lz
|
|
|
|
}
|