X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=qt-win%2Fqt-win-configure.patch;h=f2cc53fca915fdd416beeb1824064cccb14d6259;hb=66f3c6277c86718dc14a1b8728e9f28e00d148e8;hp=6fe08680dbd5855744a56e6a5a13f34299d4ac49;hpb=b61333167b189de96e48529dc8ab93b52e6fc065;p=fedora-mingw.git

diff --git a/qt-win/qt-win-configure.patch b/qt-win/qt-win-configure.patch
index 6fe0868..f2cc53f 100644
--- a/qt-win/qt-win-configure.patch
+++ b/qt-win/qt-win-configure.patch
@@ -1,9 +1,9 @@
 diff -urN qt-win-opensource-src-4.4.3.orig/configure.cache qt-win-opensource-src-4.4.3/configure.cache
 --- qt-win-opensource-src-4.4.3.orig/configure.cache	1970-01-01 01:00:00.000000000 +0100
-+++ qt-win-opensource-src-4.4.3/configure.cache	2009-02-01 23:43:14.000000000 +0000
-@@ -0,0 +1,27 @@
++++ qt-win-opensource-src-4.4.3/configure.cache	2009-02-02 14:39:05.000000000 +0000
+@@ -0,0 +1,30 @@
 +-platform 
-+win32-g++ 
++fedora-win32-cross 
 +-confirm-license 
 +-no-qmake 
 +-dont-process 
@@ -27,24 +27,152 @@ diff -urN qt-win-opensource-src-4.4.3.orig/configure.cache qt-win-opensource-src
 +/usr/i686-pc-mingw32/sys-root/mingw/lib/qt4/plugins 
 +-translationdir 
 +/usr/i686-pc-mingw32/sys-root/mingw/share/qt4/translations 
++-no-mmx 
++-no-sse 
++-no-sse2 
 +-release 
 +-shared 
+diff -urN qt-win-opensource-src-4.4.3.orig/configure.output qt-win-opensource-src-4.4.3/configure.output
+--- qt-win-opensource-src-4.4.3.orig/configure.output	1970-01-01 01:00:00.000000000 +0100
++++ qt-win-opensource-src-4.4.3/configure.output	2009-02-02 14:39:05.000000000 +0000
+@@ -0,0 +1,119 @@
++Xlib:  extension "Generic Event Extension" missing on display "localhost:10.0".
++
++This is the Qt for Windows Open Source Edition.
++
++You have already accepted the terms of the license.
++
++Setting Direct3D to NO, since the proper Direct3D SDK was not detected.
++Make sure you have the Direct3D SDK installed, and that you have run
++the <path to SDK>\Utilities\Bin\dx_setenv.cmd script.
++The D3D SDK library path *needs* to appear before the Platform SDK library
++path in your LIB environment variable.
++All the required DirectShow/Direct3D files couldn't be found.
++Make sure you have either the platform SDK AND the DirectX SDK or the Windows SDK installed.
++If you have the DirectX SDK installed, please make sure that you have run the <path to SDK>\SetEnv.Cmd script.
++Environment:
++    INCLUDE=

++      Unset
++    LIB=

++      Unset
++    PATH=

++      C:\windows\system32

++      C:\windows

++      Z:\usr\i686-pc-mingw32\sys-root\mingw\bin
++You are licensed to use this software under the terms of the GNU GPL version 2 or 3.
++See Z:/home/rjones/d/fedora-mingw--devel/qt-win/qt-win-opensource-src-4.4.3/LICENSE.GPL2
++ or Z:/home/rjones/d/fedora-mingw--devel/qt-win/qt-win-opensource-src-4.4.3/LICENSE.GPL3
++
++Configuration:
++    dist-config

++    large-config

++    medium-config

++    minimal-config

++    small-config

++    full-config

++    release
++Qt Configuration:
++    release

++    zlib

++    png

++    accessibility

++    qt3support

++    opengl

++    ipv6

++    xmlpatterns

++    svg

++    minimal-config

++    small-config

++    medium-config

++    large-config

++    full-config
++
++QMAKESPEC...................fedora-win32-cross (commandline)
++Architecture................windows
++Maketool....................make
++Debug symbols...............no
++Accessibility support.......yes
++STL support.................yes
++Exception support...........yes
++RTTI support................yes
++MMX support.................no
++3DNOW support...............no
++SSE support.................no
++SSE2 support................no
++IWMMXT support..............no
++OpenGL support..............yes
++Direct3D support............no
++OpenSSL support.............no
++QtDBus support..............no
++QtXmlPatterns support.......yes
++Phonon support..............no
++WebKit support..............no
++Qt3 compatibility...........yes
++
++Third Party Libraries:
++    ZLIB support............qt
++    GIF support.............plugin
++    TIFF support............plugin
++    JPEG support............plugin
++    PNG support.............qt
++    MNG support.............plugin
++
++Styles:
++    Windows.................yes
++    Windows XP..............no
++    Windows Vista...........no
++    Plastique...............yes
++    Cleanlooks..............yes
++    Motif...................yes
++    CDE.....................yes
++    Windows CE..............no
++    Windows Mobile..........no
++
++Sql Drivers:
++    ODBC....................no
++    MySQL...................no
++    OCI.....................no
++    PostgreSQL..............no
++    TDS.....................no
++    DB2.....................no
++    SQLite..................plugin (qt)
++    SQLite2.................no
++    InterBase...............no
++
++Sources are in..............Z:\home\rjones\d\fedora-mingw--devel\qt-win\qt-win-opensource-src-4.4.3
++Build is done in............Z:\home\rjones\d\fedora-mingw--devel\qt-win\qt-win-opensource-src-4.4.3
++Install prefix............../usr/i686-pc-mingw32/sys-root/mingw
++Headers installed to......../usr/i686-pc-mingw32/sys-root/mingw/include
++Libraries installed to....../usr/i686-pc-mingw32/sys-root/mingw/lib
++Plugins installed to......../usr/i686-pc-mingw32/sys-root/mingw/lib/qt4/plugins
++Binaries installed to......./usr/i686-pc-mingw32/sys-root/mingw/bin
++Docs installed to.........../usr/i686-pc-mingw32/sys-root/mingw/share/doc
++Data installed to.........../usr/i686-pc-mingw32/sys-root/mingw/share
++Translations installed to.../usr/i686-pc-mingw32/sys-root/mingw/share/qt4/translations
++Examples installed to......./usr/i686-pc-mingw32/sys-root/mingw/share/qt4/examples
++Demos installed to........../usr/i686-pc-mingw32/sys-root/mingw/lib/qt4/demos
++
++Processing of project files have been disabled.
++Only use this option if you really know what you're doing.
++
 diff -urN qt-win-opensource-src-4.4.3.orig/include/Qt/qconfig.h qt-win-opensource-src-4.4.3/include/Qt/qconfig.h
 --- qt-win-opensource-src-4.4.3.orig/include/Qt/qconfig.h	1970-01-01 01:00:00.000000000 +0100
-+++ qt-win-opensource-src-4.4.3/include/Qt/qconfig.h	2009-02-01 23:43:14.000000000 +0000
++++ qt-win-opensource-src-4.4.3/include/Qt/qconfig.h	2009-02-02 14:39:05.000000000 +0000
 @@ -0,0 +1 @@
 +#include "../../src/corelib/global/qconfig.h"
 diff -urN qt-win-opensource-src-4.4.3.orig/include/QtCore/qconfig.h qt-win-opensource-src-4.4.3/include/QtCore/qconfig.h
 --- qt-win-opensource-src-4.4.3.orig/include/QtCore/qconfig.h	1970-01-01 01:00:00.000000000 +0100
-+++ qt-win-opensource-src-4.4.3/include/QtCore/qconfig.h	2009-02-01 23:43:14.000000000 +0000
++++ qt-win-opensource-src-4.4.3/include/QtCore/qconfig.h	2009-02-02 14:39:05.000000000 +0000
 @@ -0,0 +1 @@
 +#include "../../src/corelib/global/qconfig.h"
 diff -urN qt-win-opensource-src-4.4.3.orig/mkspecs/default/qmake.conf qt-win-opensource-src-4.4.3/mkspecs/default/qmake.conf
 --- qt-win-opensource-src-4.4.3.orig/mkspecs/default/qmake.conf	1970-01-01 01:00:00.000000000 +0100
-+++ qt-win-opensource-src-4.4.3/mkspecs/default/qmake.conf	2009-02-01 23:43:14.000000000 +0000
-@@ -0,0 +1,107 @@
++++ qt-win-opensource-src-4.4.3/mkspecs/default/qmake.conf	2009-02-02 14:39:05.000000000 +0000
+@@ -0,0 +1,109 @@
 +#
-+# qmake configuration for win32-g++
++# qmake configuration for fedora-win32-cross
++# (Fedora Windows cross-compiler)
++# by Richard W.M. Jones (rjones@redhat.com)
 +#
 +# Written for MinGW
 +#
@@ -59,12 +187,12 @@ diff -urN qt-win-opensource-src-4.4.3.orig/mkspecs/default/qmake.conf qt-win-ope
 +QMAKE_EXT_OBJ           = .o
 +QMAKE_EXT_RES           = _res.o
 +
-+QMAKE_CC		= gcc
++QMAKE_CC		= i686-pc-mingw32-gcc
 +QMAKE_LEX		= flex
 +QMAKE_LEXFLAGS		=
 +QMAKE_YACC		= byacc
 +QMAKE_YACCFLAGS		= -d
-+QMAKE_CFLAGS		=
++QMAKE_CFLAGS		= -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 --param=ssp-buffer-size=4 -mms-bitfields
 +QMAKE_CFLAGS_DEPS	= -M
 +QMAKE_CFLAGS_WARN_ON	= -Wall
 +QMAKE_CFLAGS_WARN_OFF	= -w
@@ -72,7 +200,7 @@ diff -urN qt-win-opensource-src-4.4.3.orig/mkspecs/default/qmake.conf qt-win-ope
 +QMAKE_CFLAGS_DEBUG	= -g
 +QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
 +
-+QMAKE_CXX		= g++
++QMAKE_CXX		= i686-pc-mingw32-g++
 +QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS
 +QMAKE_CXXFLAGS_DEPS	= $$QMAKE_CFLAGS_DEPS
 +QMAKE_CXXFLAGS_WARN_ON	= $$QMAKE_CFLAGS_WARN_ON
@@ -87,15 +215,17 @@ diff -urN qt-win-opensource-src-4.4.3.orig/mkspecs/default/qmake.conf qt-win-ope
 +QMAKE_CXXFLAGS_EXCEPTIONS_OFF = -fno-exceptions
 +
 +QMAKE_INCDIR		=
-+QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-+QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
++#QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
++QMAKE_INCDIR_QT         = /usr/i686-pc-mingw32/sys-root/mingw/include
++#QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
++QMAKE_LIBDIR_QT         = /usr/i686-pc-mingw32/sys-root/mingw/lib
 +
 +QMAKE_RUN_CC		= $(CC) -c $(CFLAGS) $(INCPATH) -o $obj $src
 +QMAKE_RUN_CC_IMP	= $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
 +QMAKE_RUN_CXX		= $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src
 +QMAKE_RUN_CXX_IMP	= $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 +
-+QMAKE_LINK		= g++
++QMAKE_LINK		= i686-pc-mingw32-g++
 +QMAKE_LFLAGS		= -enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc
 +QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads -Wl
 +QMAKE_LFLAGS_EXCEPTIONS_OFF =
@@ -116,43 +246,41 @@ diff -urN qt-win-opensource-src-4.4.3.orig/mkspecs/default/qmake.conf qt-win-ope
 +QMAKE_LIBS_COMPAT       = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32
 +QMAKE_LIBS_QT_ENTRY     = -lmingw32 -lqtmain
 +
-+!isEmpty(QMAKE_SH) {
-+    MINGW_IN_SHELL      = 1
-+	QMAKE_DIR_SEP		= /
-+	QMAKE_COPY		= cp
-+	QMAKE_COPY_DIR		= xcopy /s /q /y /i
-+	QMAKE_MOVE		= mv
-+	QMAKE_DEL_FILE		= rm
-+	QMAKE_MKDIR		= mkdir
-+	QMAKE_DEL_DIR		= rmdir
-+    QMAKE_CHK_DIR_EXISTS = test -d
-+} else {
-+	QMAKE_COPY		= copy /y
-+	QMAKE_COPY_DIR		= xcopy /s /q /y /i
-+	QMAKE_MOVE		= move
-+	QMAKE_DEL_FILE		= del
-+	QMAKE_MKDIR		= mkdir
-+	QMAKE_DEL_DIR		= rmdir
-+    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_DIR_SEP         = /
++QMAKE_COPY            = cp -f
++QMAKE_COPY_FILE       = $(COPY)
++QMAKE_COPY_DIR        = $(COPY) -a
++QMAKE_MOVE            = mv -f
++QMAKE_DEL_FILE        = rm -f
++QMAKE_DEL_DIR         = rmdir
++QMAKE_STRIP           = strip
++QMAKE_STRIPFLAGS_LIB += --strip-unneeded
++QMAKE_INSTALL_FILE    = install -m 644 -p
++QMAKE_INSTALL_PROGRAM = install -m 755 -p
++
++# "qmake -win32" always appears to generate code like this:
++#   $(CHK_DIR_EXISTS) somedir $(MKDIR) somedir
++# We can't write a Unix macro that is compatible, so we have to hack it:
++QMAKE_CHK_DIR_EXISTS  = mkdir -p
++QMAKE_MKDIR           = 
++
++QMAKE_MOC		= moc-qt4
++QMAKE_UIC		= uic-qt4
++QMAKE_IDC		= idc
 +
 +QMAKE_IDL		= midl
-+QMAKE_LIB		= ar -ru
-+QMAKE_RC		= windres
++QMAKE_LIB		= i686-pc-mingw32-ar -ru
++QMAKE_RC		= i686-pc-mingw32-windres
 +QMAKE_ZIP		= zip -r -9
 +
 +QMAKE_STRIP		= strip
 +QMAKE_STRIPFLAGS_LIB 	+= --strip-unneeded
 +load(qt_config)
 +
-+QMAKESPEC_ORIGINAL=Z:/tmp/qt-win-opensource-src-4.4.3/mkspecs/win32-g++
++QMAKESPEC_ORIGINAL=Z:/home/rjones/d/fedora-mingw--devel/qt-win/qt-win-opensource-src-4.4.3/mkspecs/fedora-win32-cross
 diff -urN qt-win-opensource-src-4.4.3.orig/mkspecs/default/qplatformdefs.h qt-win-opensource-src-4.4.3/mkspecs/default/qplatformdefs.h
 --- qt-win-opensource-src-4.4.3.orig/mkspecs/default/qplatformdefs.h	1970-01-01 01:00:00.000000000 +0100
-+++ qt-win-opensource-src-4.4.3/mkspecs/default/qplatformdefs.h	2008-09-27 10:00:52.000000000 +0100
++++ qt-win-opensource-src-4.4.3/mkspecs/default/qplatformdefs.h	2009-02-02 14:39:01.000000000 +0000
 @@ -0,0 +1,160 @@
 +/****************************************************************************
 +**
@@ -316,12 +444,12 @@ diff -urN qt-win-opensource-src-4.4.3.orig/mkspecs/default/qplatformdefs.h qt-wi
 +#endif // QPLATFORMDEFS_H
 diff -urN qt-win-opensource-src-4.4.3.orig/mkspecs/qconfig.pri qt-win-opensource-src-4.4.3/mkspecs/qconfig.pri
 --- qt-win-opensource-src-4.4.3.orig/mkspecs/qconfig.pri	1970-01-01 01:00:00.000000000 +0100
-+++ qt-win-opensource-src-4.4.3/mkspecs/qconfig.pri	2009-02-01 23:43:14.000000000 +0000
++++ qt-win-opensource-src-4.4.3/mkspecs/qconfig.pri	2009-02-02 14:39:05.000000000 +0000
 @@ -0,0 +1,11 @@
 +CONFIG+= release shared stl exceptions rtti
 +QT_ARCH = windows
 +QT_EDITION = OpenSource
-+QT_CONFIG += release zlib png accessibility qt3support opengl ipv6 xmlpatterns webkit svg minimal-config small-config medium-config large-config full-config
++QT_CONFIG += release zlib png accessibility qt3support opengl ipv6 xmlpatterns svg minimal-config small-config medium-config large-config full-config
 +#versioning 
 +QT_VERSION = 4.4.3
 +QT_MAJOR_VERSION = 4
@@ -331,35 +459,31 @@ diff -urN qt-win-opensource-src-4.4.3.orig/mkspecs/qconfig.pri qt-win-opensource
 +QT_CE_C_RUNTIME = no
 diff -urN qt-win-opensource-src-4.4.3.orig/.qmake.cache qt-win-opensource-src-4.4.3/.qmake.cache
 --- qt-win-opensource-src-4.4.3.orig/.qmake.cache	1970-01-01 01:00:00.000000000 +0100
-+++ qt-win-opensource-src-4.4.3/.qmake.cache	2009-02-01 23:43:14.000000000 +0000
-@@ -0,0 +1,24 @@
++++ qt-win-opensource-src-4.4.3/.qmake.cache	2009-02-02 14:39:05.000000000 +0000
+@@ -0,0 +1,20 @@
 +QMAKE_QT_VERSION_OVERRIDE = 4
-+OBJECTS_DIR     = tmp/obj/release_shared
-+MOC_DIR         = tmp/moc/release_shared
-+RCC_DIR         = tmp/rcc/release_shared
++OBJECTS_DIR     = tmp\obj\release_shared
++MOC_DIR         = tmp\moc\release_shared
++RCC_DIR         = tmp\rcc\release_shared
 +sql-plugins    += sqlite
-+styles         += windows plastique cleanlooks windowsxp windowsvista motif cde
++styles         += windows plastique cleanlooks motif cde
 +imageformat-plugins += gif tiff jpeg
-+TMPPATH            = $$quote($$(INCLUDE))
-+QMAKE_INCDIR_POST += $$split(TMPPATH,";")
-+TMPPATH            = $$quote($$(LIB))
-+QMAKE_LIBDIR_POST += $$split(TMPPATH,";")
 +CONFIG         += dist-config large-config medium-config minimal-config small-config full-config release incremental create_prl link_prl depend_includepath QTDIR_build
 +QT_BUILD_PARTS  = libs tools examples demos docs translations
-+QMAKESPEC       = Z:/tmp/qt-win-opensource-src-4.4.3/mkspecs/win32-g++
++QMAKESPEC       = Z:\home\rjones\d\fedora-mingw--devel\qt-win\qt-win-opensource-src-4.4.3\mkspecs\fedora-win32-cross
 +ARCH            = windows
-+QT_BUILD_TREE   = Z:/tmp/qt-win-opensource-src-4.4.3
-+QT_SOURCE_TREE  = Z:/tmp/qt-win-opensource-src-4.4.3
-+QMAKE_MOC       = $$QT_BUILD_TREE/bin/moc.exe
-+QMAKE_UIC       = $$QT_BUILD_TREE/bin/uic.exe
-+QMAKE_UIC3      = $$QT_BUILD_TREE/bin/uic3.exe
-+QMAKE_RCC       = $$QT_BUILD_TREE/bin/rcc.exe
-+QMAKE_DUMPCPP   = $$QT_BUILD_TREE/bin/dumpcpp.exe
-+QMAKE_INCDIR_QT = $$QT_BUILD_TREE/include
-+QMAKE_LIBDIR_QT = $$QT_BUILD_TREE/lib
++QT_BUILD_TREE   = Z:\home\rjones\d\fedora-mingw--devel\qt-win\qt-win-opensource-src-4.4.3
++QT_SOURCE_TREE  = Z:\home\rjones\d\fedora-mingw--devel\qt-win\qt-win-opensource-src-4.4.3
++QMAKE_MOC       = $$QT_BUILD_TREE\bin\moc.exe
++QMAKE_UIC       = $$QT_BUILD_TREE\bin\uic.exe
++QMAKE_UIC3      = $$QT_BUILD_TREE\bin\uic3.exe
++QMAKE_RCC       = $$QT_BUILD_TREE\bin\rcc.exe
++QMAKE_DUMPCPP   = $$QT_BUILD_TREE\bin\dumpcpp.exe
++QMAKE_INCDIR_QT = $$QT_BUILD_TREE\include
++QMAKE_LIBDIR_QT = $$QT_BUILD_TREE\lib
 diff -urN qt-win-opensource-src-4.4.3.orig/src/corelib/global/qconfig.cpp qt-win-opensource-src-4.4.3/src/corelib/global/qconfig.cpp
 --- qt-win-opensource-src-4.4.3.orig/src/corelib/global/qconfig.cpp	1970-01-01 01:00:00.000000000 +0100
-+++ qt-win-opensource-src-4.4.3/src/corelib/global/qconfig.cpp	2009-02-01 23:43:14.000000000 +0000
++++ qt-win-opensource-src-4.4.3/src/corelib/global/qconfig.cpp	2009-02-02 14:39:05.000000000 +0000
 @@ -0,0 +1,27 @@
 +/* Licensed */
 +static const char qt_configure_licensee_str          [512 + 12] = "qt_lcnsuser=Open Source";
@@ -390,8 +514,8 @@ diff -urN qt-win-opensource-src-4.4.3.orig/src/corelib/global/qconfig.cpp qt-win
 +
 diff -urN qt-win-opensource-src-4.4.3.orig/src/corelib/global/qconfig.h qt-win-opensource-src-4.4.3/src/corelib/global/qconfig.h
 --- qt-win-opensource-src-4.4.3.orig/src/corelib/global/qconfig.h	1970-01-01 01:00:00.000000000 +0100
-+++ qt-win-opensource-src-4.4.3/src/corelib/global/qconfig.h	2009-02-01 23:43:14.000000000 +0000
-@@ -0,0 +1,72 @@
++++ qt-win-opensource-src-4.4.3/src/corelib/global/qconfig.h	2009-02-02 14:39:05.000000000 +0000
+@@ -0,0 +1,90 @@
 +/* Everything */
 +
 +#ifndef QT_DLL
@@ -409,15 +533,15 @@ diff -urN qt-win-opensource-src-4.4.3.orig/src/corelib/global/qconfig.h qt-win-o
 +
 +#if (defined(_DEBUG) || defined(DEBUG))
 +# if (defined(WIN64) || defined(_WIN64) || defined(__WIN64__))
-+#  define QT_BUILD_KEY "Windows x64 mingw debug full-config"
++#  define QT_BUILD_KEY "Windows x64 msvc debug full-config"
 +# else
-+#  define QT_BUILD_KEY "Windows mingw debug full-config"
++#  define QT_BUILD_KEY "Windows msvc debug full-config"
 +# endif
 +#else
 +# if (defined(WIN64) || defined(_WIN64) || defined(__WIN64__))
-+#  define QT_BUILD_KEY "Windows x64 mingw release full-config"
++#  define QT_BUILD_KEY "Windows x64 msvc release full-config"
 +# else
-+#  define QT_BUILD_KEY "Windows mingw release full-config"
++#  define QT_BUILD_KEY "Windows msvc release full-config"
 +# endif
 +#endif
 +
@@ -464,3 +588,21 @@ diff -urN qt-win-opensource-src-4.4.3.orig/src/corelib/global/qconfig.h qt-win-o
 +# define QT_NO_STYLE_WINDOWSMOBILE
 +#endif
 +
++#if defined(QT_NO_STYLE_WINDOWSVISTA) && defined(QT_STYLE_WINDOWSVISTA)
++# undef QT_NO_STYLE_WINDOWSVISTA
++#elif !defined(QT_NO_STYLE_WINDOWSVISTA)
++# define QT_NO_STYLE_WINDOWSVISTA
++#endif
++
++#if defined(QT_NO_STYLE_WINDOWSXP) && defined(QT_STYLE_WINDOWSXP)
++# undef QT_NO_STYLE_WINDOWSXP
++#elif !defined(QT_NO_STYLE_WINDOWSXP)
++# define QT_NO_STYLE_WINDOWSXP
++#endif
++
++#if defined(QT_NO_WEBKIT) && defined(QT_WEBKIT)
++# undef QT_NO_WEBKIT
++#elif !defined(QT_NO_WEBKIT)
++# define QT_NO_WEBKIT
++#endif
++