-diff -urN qt-win-opensource-src-4.5.0-rc1.orig/configure.cache qt-win-opensource-src-4.5.0-rc1/configure.cache
---- qt-win-opensource-src-4.5.0-rc1.orig/configure.cache 1970-01-01 01:00:00.000000000 +0100
-+++ qt-win-opensource-src-4.5.0-rc1/configure.cache 2009-02-21 11:25:13.000000000 +0000
-@@ -0,0 +1,30 @@
-+-platform \r
-+fedora-win32-cross \r
-+-confirm-license \r
-+-no-qmake \r
-+-dont-process \r
-+-prefix \r
-+/usr/i686-pc-mingw32/sys-root/mingw \r
-+-bindir \r
-+/usr/i686-pc-mingw32/sys-root/mingw/bin \r
-+-datadir \r
-+/usr/i686-pc-mingw32/sys-root/mingw/share \r
-+-demosdir \r
-+/usr/i686-pc-mingw32/sys-root/mingw/lib/qt4/demos \r
-+-docdir \r
-+/usr/i686-pc-mingw32/sys-root/mingw/share/doc \r
-+-examplesdir \r
-+/usr/i686-pc-mingw32/sys-root/mingw/share/qt4/examples \r
-+-headerdir \r
-+/usr/i686-pc-mingw32/sys-root/mingw/include \r
-+-libdir \r
-+/usr/i686-pc-mingw32/sys-root/mingw/lib \r
-+-plugindir \r
-+/usr/i686-pc-mingw32/sys-root/mingw/lib/qt4/plugins \r
-+-translationdir \r
-+/usr/i686-pc-mingw32/sys-root/mingw/share/qt4/translations \r
-+-no-mmx \r
-+-no-sse \r
-+-no-sse2 \r
-+-release \r
-+-shared \r
-diff -urN qt-win-opensource-src-4.5.0-rc1.orig/configure.output qt-win-opensource-src-4.5.0-rc1/configure.output
---- qt-win-opensource-src-4.5.0-rc1.orig/configure.output 1970-01-01 01:00:00.000000000 +0100
-+++ qt-win-opensource-src-4.5.0-rc1/configure.output 2009-02-21 11:25:13.000000000 +0000
-@@ -0,0 +1,122 @@
-+Xlib: extension "Generic Event Extension" missing on display "localhost:13.0".
-+\r
-+This is the Qt for Windows Open Source Edition.\r
-+\r
-+You have already accepted the terms of the license.\r
-+\r
-+Setting Direct3D to NO, since the proper Direct3D SDK was not detected.\r
-+Make sure you have the Direct3D SDK installed, and that you have run\r
-+the <path to SDK>\Utilities\Bin\dx_setenv.cmd script.\r
-+The D3D SDK library path *needs* to appear before the Platform SDK library\r
-+path in your LIB environment variable.\r
-+All the required DirectShow/Direct3D files couldn't be found.\r
-+Make sure you have either the platform SDK AND the DirectX SDK or the Windows SDK installed.\r
-+If you have the DirectX SDK installed, please make sure that you have run the <path to SDK>\SetEnv.Cmd script.\r
-+Environment:\r
-+ INCLUDE=\r\r
-+ Unset\r
-+ LIB=\r\r
-+ Unset\r
-+ PATH=\r\r
-+ C:\windows\system32\r\r
-+ C:\windows\r\r
-+ Z:\usr\i686-pc-mingw32\sys-root\mingw\bin\r
-+You are licensed to use this software under the terms of the GNU GPL version 2 or 3.\r
-+See Z:/home/rjones/d/fedora-mingw--devel/qt-win/qt-win-opensource-src-4.5.0-rc1/LICENSE.GPL2\r
-+ or Z:/home/rjones/d/fedora-mingw--devel/qt-win/qt-win-opensource-src-4.5.0-rc1/LICENSE.GPL3\r
-+\r
-+Configuration:\r
-+ dist-config\r\r
-+ large-config\r\r
-+ medium-config\r\r
-+ minimal-config\r\r
-+ small-config\r\r
-+ full-config\r\r
-+ release\r
-+Qt Configuration:\r
-+ release\r\r
-+ zlib\r\r
-+ png\r\r
-+ accessibility\r\r
-+ qt3support\r\r
-+ opengl\r\r
-+ ipv6\r\r
-+ scripttools\r\r
-+ xmlpatterns\r\r
-+ svg\r\r
-+ minimal-config\r\r
-+ small-config\r\r
-+ medium-config\r\r
-+ large-config\r\r
-+ full-config\r
-+\r
-+QMAKESPEC...................fedora-win32-cross (commandline)\r
-+Architecture................windows\r
-+Maketool....................make\r
-+Debug symbols...............no\r
-+Accessibility support.......yes\r
-+STL support.................yes\r
-+Exception support...........yes\r
-+RTTI support................yes\r
-+MMX support.................no\r
-+3DNOW support...............no\r
-+SSE support.................no\r
-+SSE2 support................no\r
-+IWMMXT support..............no\r
-+OpenGL support..............yes\r
-+Direct3D support............no\r
-+OpenSSL support.............no\r
-+QtDBus support..............no\r
-+QtXmlPatterns support.......yes\r
-+Phonon support..............no\r
-+WebKit support..............no\r
-+QtScriptTools support.......yes\r
-+Graphics System.............raster\r
-+Qt3 compatibility...........yes\r
-+\r
-+Third Party Libraries:\r
-+ ZLIB support............qt\r
-+ GIF support.............plugin\r
-+ TIFF support............plugin\r
-+ JPEG support............plugin\r
-+ PNG support.............qt\r
-+ MNG support.............plugin\r
-+\r
-+Styles:\r
-+ Windows.................yes\r
-+ Windows XP..............no\r
-+ Windows Vista...........no\r
-+ Plastique...............yes\r
-+ Cleanlooks..............yes\r
-+ Motif...................yes\r
-+ CDE.....................yes\r
-+ Windows CE..............no\r
-+ Windows Mobile..........no\r
-+\r
-+Sql Drivers:\r
-+ ODBC....................no\r
-+ MySQL...................no\r
-+ OCI.....................no\r
-+ PostgreSQL..............no\r
-+ TDS.....................no\r
-+ DB2.....................no\r
-+ SQLite..................plugin (qt)\r
-+ SQLite2.................no\r
-+ InterBase...............no\r
-+\r
-+Sources are in..............Z:\home\rjones\d\fedora-mingw--devel\qt-win\qt-win-opensource-src-4.5.0-rc1\r
-+Build is done in............Z:\home\rjones\d\fedora-mingw--devel\qt-win\qt-win-opensource-src-4.5.0-rc1\r
-+Install prefix............../usr/i686-pc-mingw32/sys-root/mingw\r
-+Headers installed to......../usr/i686-pc-mingw32/sys-root/mingw/include\r
-+Libraries installed to....../usr/i686-pc-mingw32/sys-root/mingw/lib\r
-+Plugins installed to......../usr/i686-pc-mingw32/sys-root/mingw/lib/qt4/plugins\r
-+Binaries installed to......./usr/i686-pc-mingw32/sys-root/mingw/bin\r
-+Docs installed to.........../usr/i686-pc-mingw32/sys-root/mingw/share/doc\r
-+Data installed to.........../usr/i686-pc-mingw32/sys-root/mingw/share\r
-+Translations installed to.../usr/i686-pc-mingw32/sys-root/mingw/share/qt4/translations\r
-+Examples installed to......./usr/i686-pc-mingw32/sys-root/mingw/share/qt4/examples\r
-+Demos installed to........../usr/i686-pc-mingw32/sys-root/mingw/lib/qt4/demos\r
-+\r
-+Processing of project files have been disabled.\r
-+Only use this option if you really know what you're doing.\r
-+\r
-diff -urN qt-win-opensource-src-4.5.0-rc1.orig/include/Qt/qconfig.h qt-win-opensource-src-4.5.0-rc1/include/Qt/qconfig.h
---- qt-win-opensource-src-4.5.0-rc1.orig/include/Qt/qconfig.h 1970-01-01 01:00:00.000000000 +0100
-+++ qt-win-opensource-src-4.5.0-rc1/include/Qt/qconfig.h 2009-02-21 11:25:13.000000000 +0000
-@@ -0,0 +1 @@
-+#include "../../src/corelib/global/qconfig.h"
-diff -urN qt-win-opensource-src-4.5.0-rc1.orig/include/QtCore/qconfig.h qt-win-opensource-src-4.5.0-rc1/include/QtCore/qconfig.h
---- qt-win-opensource-src-4.5.0-rc1.orig/include/QtCore/qconfig.h 1970-01-01 01:00:00.000000000 +0100
-+++ qt-win-opensource-src-4.5.0-rc1/include/QtCore/qconfig.h 2009-02-21 11:25:13.000000000 +0000
-@@ -0,0 +1 @@
-+#include "../../src/corelib/global/qconfig.h"
-diff -urN qt-win-opensource-src-4.5.0-rc1.orig/mkspecs/default/qmake.conf qt-win-opensource-src-4.5.0-rc1/mkspecs/default/qmake.conf
---- qt-win-opensource-src-4.5.0-rc1.orig/mkspecs/default/qmake.conf 1970-01-01 01:00:00.000000000 +0100
-+++ qt-win-opensource-src-4.5.0-rc1/mkspecs/default/qmake.conf 2009-02-21 11:25:13.000000000 +0000
-@@ -0,0 +1,109 @@
-+#\r
-+# qmake configuration for fedora-win32-cross\r
-+# (Fedora Windows cross-compiler)\r
-+# by Richard W.M. Jones (rjones@redhat.com)\r
-+#\r
-+# Written for MinGW\r
-+#\r
-+\r
-+MAKEFILE_GENERATOR = MINGW\r
-+TEMPLATE = app\r
-+CONFIG += qt warn_on release link_prl copy_dir_files debug_and_release debug_and_release_target precompile_header\r
-+QT += core gui\r
-+DEFINES += UNICODE QT_LARGEFILE_SUPPORT\r
-+QMAKE_COMPILER_DEFINES += __GNUC__ WIN32\r
-+\r
-+QMAKE_EXT_OBJ = .o\r
-+QMAKE_EXT_RES = _res.o\r
-+\r
-+QMAKE_CC = i686-pc-mingw32-gcc\r
-+QMAKE_LEX = flex\r
-+QMAKE_LEXFLAGS =\r
-+QMAKE_YACC = byacc\r
-+QMAKE_YACCFLAGS = -d\r
-+QMAKE_CFLAGS = -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 --param=ssp-buffer-size=4 -mms-bitfields\r
-+QMAKE_CFLAGS_DEPS = -M\r
-+QMAKE_CFLAGS_WARN_ON = -Wall\r
-+QMAKE_CFLAGS_WARN_OFF = -w\r
-+QMAKE_CFLAGS_RELEASE = -O2\r
-+QMAKE_CFLAGS_DEBUG = -g\r
-+QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses\r
-+\r
-+QMAKE_CXX = i686-pc-mingw32-g++\r
-+QMAKE_CXXFLAGS = $$QMAKE_CFLAGS\r
-+QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS\r
-+QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON\r
-+QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF\r
-+QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE\r
-+QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG\r
-+QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC\r
-+QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD\r
-+QMAKE_CXXFLAGS_RTTI_ON = -frtti\r
-+QMAKE_CXXFLAGS_RTTI_OFF = -fno-rtti\r
-+QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions -mthreads\r
-+QMAKE_CXXFLAGS_EXCEPTIONS_OFF = -fno-exceptions\r
-+\r
-+QMAKE_INCDIR =\r
-+#QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS]\r
-+QMAKE_INCDIR_QT = /usr/i686-pc-mingw32/sys-root/mingw/include\r
-+#QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS]\r
-+QMAKE_LIBDIR_QT = /usr/i686-pc-mingw32/sys-root/mingw/lib\r
-+\r
-+QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -o $obj $src\r
-+QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<\r
-+QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src\r
-+QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<\r
-+\r
-+QMAKE_LINK = i686-pc-mingw32-g++\r
-+QMAKE_LFLAGS = -enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc\r
-+QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads -Wl\r
-+QMAKE_LFLAGS_EXCEPTIONS_OFF =\r
-+QMAKE_LFLAGS_RELEASE = -Wl,-s\r
-+QMAKE_LFLAGS_DEBUG =\r
-+QMAKE_LFLAGS_CONSOLE = -Wl,-subsystem,console\r
-+QMAKE_LFLAGS_WINDOWS = -Wl,-subsystem,windows\r
-+QMAKE_LFLAGS_DLL = -shared\r
-+QMAKE_LINK_OBJECT_MAX = 10\r
-+QMAKE_LINK_OBJECT_SCRIPT= object_script\r
-+\r
-+\r
-+QMAKE_LIBS =\r
-+QMAKE_LIBS_CORE = -lkernel32 -luser32 -lshell32 -luuid -lole32 -ladvapi32 -lws2_32\r
-+QMAKE_LIBS_GUI = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lwinspool -lws2_32 -lole32 -luuid -luser32 -ladvapi32\r
-+QMAKE_LIBS_NETWORK = -lws2_32\r
-+QMAKE_LIBS_OPENGL = -lopengl32 -lglu32 -lgdi32 -luser32\r
-+QMAKE_LIBS_COMPAT = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32\r
-+QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain\r
-+\r
-+QMAKE_DIR_SEP = /\r
-+QMAKE_COPY = cp -f\r
-+QMAKE_COPY_FILE = $(COPY)\r
-+QMAKE_COPY_DIR = $(COPY) -a\r
-+QMAKE_MOVE = mv -f\r
-+QMAKE_DEL_FILE = rm -f\r
-+QMAKE_DEL_DIR = rmdir\r
-+QMAKE_STRIP = strip\r
-+QMAKE_STRIPFLAGS_LIB += --strip-unneeded\r
-+QMAKE_INSTALL_FILE = install -m 644 -p\r
-+QMAKE_INSTALL_PROGRAM = install -m 755 -p\r
-+\r
-+# "qmake -win32" always appears to generate code like this:\r
-+# $(CHK_DIR_EXISTS) somedir $(MKDIR) somedir\r
-+# We can't write a Unix macro that is compatible, so we have to hack it:\r
-+QMAKE_CHK_DIR_EXISTS = mkdir -p\r
-+QMAKE_MKDIR = \r
-+\r
-+QMAKE_MOC = moc-qt4\r
-+QMAKE_UIC = uic-qt4\r
-+QMAKE_IDC = idc\r
-+\r
-+QMAKE_IDL = midl\r
-+QMAKE_LIB = i686-pc-mingw32-ar -ru\r
-+QMAKE_RC = i686-pc-mingw32-windres\r
-+QMAKE_ZIP = zip -r -9\r
-+\r
-+QMAKE_STRIP = strip\r
-+QMAKE_STRIPFLAGS_LIB += --strip-unneeded\r
-+load(qt_config)\r
-+\r
-+QMAKESPEC_ORIGINAL=Z:/home/rjones/d/fedora-mingw--devel/qt-win/qt-win-opensource-src-4.5.0-rc1/mkspecs/fedora-win32-cross\r
-diff -urN qt-win-opensource-src-4.5.0-rc1.orig/mkspecs/default/qplatformdefs.h qt-win-opensource-src-4.5.0-rc1/mkspecs/default/qplatformdefs.h
---- qt-win-opensource-src-4.5.0-rc1.orig/mkspecs/default/qplatformdefs.h 1970-01-01 01:00:00.000000000 +0100
-+++ qt-win-opensource-src-4.5.0-rc1/mkspecs/default/qplatformdefs.h 2009-02-21 11:25:06.000000000 +0000
-@@ -0,0 +1,160 @@
-+/****************************************************************************\r
-+**\r
-+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).\r
-+** Contact: Qt Software Information (qt-info@nokia.com)\r
-+**\r
-+** This file is part of the qmake spec of the Qt Toolkit.\r
-+**\r
-+** Commercial Usage\r
-+** Licensees holding valid Qt Commercial licenses may use this file in\r
-+** accordance with the Qt Commercial License Agreement provided with the\r
-+** Software or, alternatively, in accordance with the terms contained in\r
-+** a written agreement between you and Nokia.\r
-+**\r
-+**\r
-+** GNU General Public License Usage\r
-+** Alternatively, this file may be used under the terms of the GNU\r
-+** General Public License versions 2.0 or 3.0 as published by the Free\r
-+** Software Foundation and appearing in the file LICENSE.GPL included in\r
-+** the packaging of this file. Please review the following information\r
-+** to ensure GNU General Public Licensing requirements will be met:\r
-+** http://www.fsf.org/licensing/licenses/info/GPLv2.html and\r
-+** http://www.gnu.org/copyleft/gpl.html. In addition, as a special\r
-+** exception, Nokia gives you certain additional rights. These rights\r
-+** are described in the Nokia Qt GPL Exception version 1.3, included in\r
-+** the file GPL_EXCEPTION.txt in this package.\r
-+**\r
-+** Qt for Windows(R) Licensees\r
-+** As a special exception, Nokia, as the sole copyright holder for Qt\r
-+** Designer, grants users of the Qt/Eclipse Integration plug-in the\r
-+** right for the Qt/Eclipse Integration to link to functionality\r
-+** provided by Qt Designer and its related libraries.\r
-+**\r
-+** If you are unsure which license is appropriate for your use, please\r
-+** contact the sales department at qt-sales@nokia.com.\r
-+**\r
-+****************************************************************************/\r
-+\r
-+#ifndef QPLATFORMDEFS_H\r
-+#define QPLATFORMDEFS_H\r
-+\r
-+#ifdef UNICODE\r
-+#ifndef _UNICODE\r
-+#define _UNICODE\r
-+#endif\r
-+#endif\r
-+\r
-+// Get Qt defines/settings\r
-+\r
-+#include "qglobal.h"\r
-+\r
-+#include <tchar.h>\r
-+#include <io.h>\r
-+#include <direct.h>\r
-+#include <stdio.h>\r
-+#include <fcntl.h>\r
-+#include <errno.h>\r
-+#include <sys/stat.h>\r
-+#include <stdlib.h>\r
-+#include <windows.h>\r
-+#include <limits.h>\r
-+\r
-+#if !defined(_WIN32_WINNT) || (_WIN32_WINNT-0 < 0x0500)\r
-+typedef enum {\r
-+ NameUnknown = 0, \r
-+ NameFullyQualifiedDN = 1, \r
-+ NameSamCompatible = 2, \r
-+ NameDisplay = 3, \r
-+ NameUniqueId = 6, \r
-+ NameCanonical = 7, \r
-+ NameUserPrincipal = 8, \r
-+ NameCanonicalEx = 9, \r
-+ NameServicePrincipal = 10, \r
-+ NameDnsDomain = 12\r
-+} EXTENDED_NAME_FORMAT, *PEXTENDED_NAME_FORMAT;\r
-+#endif\r
-+\r
-+#define Q_FS_FAT\r
-+#ifdef QT_LARGEFILE_SUPPORT\r
-+#define QT_STATBUF struct _stati64 // non-ANSI defs\r
-+#define QT_STATBUF4TSTAT struct _stati64 // non-ANSI defs\r
-+#define QT_STAT ::_stati64\r
-+#define QT_FSTAT ::_fstati64\r
-+#else\r
-+#define QT_STATBUF struct _stat // non-ANSI defs\r
-+#define QT_STATBUF4TSTAT struct _stat // non-ANSI defs\r
-+#define QT_STAT ::_stat\r
-+#define QT_FSTAT ::_fstat\r
-+#endif\r
-+#define QT_STAT_REG _S_IFREG\r
-+#define QT_STAT_DIR _S_IFDIR\r
-+#define QT_STAT_MASK _S_IFMT\r
-+#if defined(_S_IFLNK)\r
-+# define QT_STAT_LNK _S_IFLNK\r
-+#endif\r
-+#define QT_FILENO _fileno\r
-+#define QT_OPEN ::_open\r
-+#define QT_CLOSE ::_close\r
-+#ifdef QT_LARGEFILE_SUPPORT\r
-+#define QT_LSEEK ::_lseeki64\r
-+#ifndef UNICODE\r
-+#define QT_TSTAT ::_stati64\r
-+#else\r
-+#define QT_TSTAT ::_wstati64\r
-+#endif\r
-+#else\r
-+#define QT_LSEEK ::_lseek\r
-+#ifndef UNICODE\r
-+#define QT_TSTAT ::_stat\r
-+#else\r
-+#define QT_TSTAT ::_wstat\r
-+#endif\r
-+#endif\r
-+#define QT_READ ::_read\r
-+#define QT_WRITE ::_write\r
-+#define QT_ACCESS ::_access\r
-+#define QT_GETCWD ::_getcwd\r
-+#define QT_CHDIR ::_chdir\r
-+#define QT_MKDIR ::_mkdir\r
-+#define QT_RMDIR ::_rmdir\r
-+#define QT_OPEN_LARGEFILE 0\r
-+#define QT_OPEN_RDONLY _O_RDONLY\r
-+#define QT_OPEN_WRONLY _O_WRONLY\r
-+#define QT_OPEN_RDWR _O_RDWR\r
-+#define QT_OPEN_CREAT _O_CREAT\r
-+#define QT_OPEN_TRUNC _O_TRUNC\r
-+#define QT_OPEN_APPEND _O_APPEND\r
-+#if defined(O_TEXT)\r
-+# define QT_OPEN_TEXT _O_TEXT\r
-+# define QT_OPEN_BINARY _O_BINARY\r
-+#endif\r
-+\r
-+#define QT_FOPEN ::fopen\r
-+#ifdef QT_LARGEFILE_SUPPORT\r
-+#define QT_FSEEK ::fseeko64\r
-+#define QT_FTELL ::ftello64\r
-+#else\r
-+#define QT_FSEEK ::fseek\r
-+#define QT_FTELL ::ftell\r
-+#endif\r
-+#define QT_FGETPOS ::fgetpos\r
-+#define QT_FSETPOS ::fsetpos\r
-+#define QT_FPOS_T fpos_t\r
-+#ifdef QT_LARGEFILE_SUPPORT\r
-+#define QT_OFF_T off64_t\r
-+#else\r
-+#define QT_OFF_T long\r
-+#endif\r
-+\r
-+#define QT_SIGNAL_ARGS int\r
-+\r
-+#define QT_VSNPRINTF ::_vsnprintf\r
-+#define QT_SNPRINTF ::_snprintf\r
-+\r
-+# define F_OK 0\r
-+# define X_OK 1\r
-+# define W_OK 2\r
-+# define R_OK 4\r
-+\r
-+\r
-+#endif // QPLATFORMDEFS_H\r
-diff -urN qt-win-opensource-src-4.5.0-rc1.orig/mkspecs/qconfig.pri qt-win-opensource-src-4.5.0-rc1/mkspecs/qconfig.pri
---- qt-win-opensource-src-4.5.0-rc1.orig/mkspecs/qconfig.pri 1970-01-01 01:00:00.000000000 +0100
-+++ qt-win-opensource-src-4.5.0-rc1/mkspecs/qconfig.pri 2009-02-21 11:25:13.000000000 +0000
-@@ -0,0 +1,11 @@
-+CONFIG+= release shared stl exceptions rtti\r
-+QT_ARCH = windows\r
-+QT_EDITION = OpenSource\r
-+QT_CONFIG += release zlib png accessibility qt3support opengl ipv6 scripttools xmlpatterns svg minimal-config small-config medium-config large-config full-config\r
-+#versioning \r
-+QT_VERSION = 4.5.0-rc1\r
-+QT_MAJOR_VERSION = 4\r
-+QT_MINOR_VERSION = 5\r
-+QT_PATCH_VERSION = 0\r
-+#Qt for Windows CE c-runtime deployment\r
-+QT_CE_C_RUNTIME = no\r
-diff -urN qt-win-opensource-src-4.5.0-rc1.orig/.qmake.cache qt-win-opensource-src-4.5.0-rc1/.qmake.cache
---- qt-win-opensource-src-4.5.0-rc1.orig/.qmake.cache 1970-01-01 01:00:00.000000000 +0100
-+++ qt-win-opensource-src-4.5.0-rc1/.qmake.cache 2009-02-21 11:25:13.000000000 +0000
-@@ -0,0 +1,20 @@
-+QMAKE_QT_VERSION_OVERRIDE = 4\r
-+OBJECTS_DIR = tmp\obj\release_shared\r
-+MOC_DIR = tmp\moc\release_shared\r
-+RCC_DIR = tmp\rcc\release_shared\r
-+sql-plugins += sqlite\r
-+styles += windows plastique cleanlooks motif cde\r
-+imageformat-plugins += gif tiff jpeg\r
-+CONFIG += dist-config large-config medium-config minimal-config small-config full-config release incremental create_prl link_prl depend_includepath QTDIR_build\r
-+QT_BUILD_PARTS = libs tools examples demos docs translations\r
-+QMAKESPEC = Z:\home\rjones\d\fedora-mingw--devel\qt-win\qt-win-opensource-src-4.5.0-rc1\mkspecs\fedora-win32-cross\r
-+ARCH = windows\r
-+QT_BUILD_TREE = Z:\home\rjones\d\fedora-mingw--devel\qt-win\qt-win-opensource-src-4.5.0-rc1\r
-+QT_SOURCE_TREE = Z:\home\rjones\d\fedora-mingw--devel\qt-win\qt-win-opensource-src-4.5.0-rc1\r
-+QMAKE_MOC = $$QT_BUILD_TREE\bin\moc.exe\r
-+QMAKE_UIC = $$QT_BUILD_TREE\bin\uic.exe\r
-+QMAKE_UIC3 = $$QT_BUILD_TREE\bin\uic3.exe\r
-+QMAKE_RCC = $$QT_BUILD_TREE\bin\rcc.exe\r
-+QMAKE_DUMPCPP = $$QT_BUILD_TREE\bin\dumpcpp.exe\r
-+QMAKE_INCDIR_QT = $$QT_BUILD_TREE\include\r
-+QMAKE_LIBDIR_QT = $$QT_BUILD_TREE\lib\r
-diff -urN qt-win-opensource-src-4.5.0-rc1.orig/src/corelib/global/qconfig.cpp qt-win-opensource-src-4.5.0-rc1/src/corelib/global/qconfig.cpp
---- qt-win-opensource-src-4.5.0-rc1.orig/src/corelib/global/qconfig.cpp 1970-01-01 01:00:00.000000000 +0100
-+++ qt-win-opensource-src-4.5.0-rc1/src/corelib/global/qconfig.cpp 2009-02-21 11:25:13.000000000 +0000
-@@ -0,0 +1,27 @@
-+/* Licensed */
-+static const char qt_configure_licensee_str [512 + 12] = "qt_lcnsuser=Open Source";
-+static const char qt_configure_licensed_products_str [512 + 12] = "qt_lcnsprod=OpenSource";
-+static const char qt_configure_prefix_path_str [512 + 12] = "qt_prfxpath=/usr/i686-pc-mingw32/sys-root/mingw";
-+static const char qt_configure_documentation_path_str[512 + 12] = "qt_docspath=/usr/i686-pc-mingw32/sys-root/mingw/share/doc";
-+static const char qt_configure_headers_path_str [512 + 12] = "qt_hdrspath=/usr/i686-pc-mingw32/sys-root/mingw/include";
-+static const char qt_configure_libraries_path_str [512 + 12] = "qt_libspath=/usr/i686-pc-mingw32/sys-root/mingw/lib";
-+static const char qt_configure_binaries_path_str [512 + 12] = "qt_binspath=/usr/i686-pc-mingw32/sys-root/mingw/bin";
-+static const char qt_configure_plugins_path_str [512 + 12] = "qt_plugpath=/usr/i686-pc-mingw32/sys-root/mingw/lib/qt4/plugins";
-+static const char qt_configure_data_path_str [512 + 12] = "qt_datapath=/usr/i686-pc-mingw32/sys-root/mingw/share";
-+static const char qt_configure_translations_path_str [512 + 12] = "qt_trnspath=/usr/i686-pc-mingw32/sys-root/mingw/share/qt4/translations";
-+static const char qt_configure_examples_path_str [512 + 12] = "qt_xmplpath=/usr/i686-pc-mingw32/sys-root/mingw/share/qt4/examples";
-+static const char qt_configure_demos_path_str [512 + 12] = "qt_demopath=/usr/i686-pc-mingw32/sys-root/mingw/lib/qt4/demos";
-+/* strlen( "qt_lcnsxxxx" ) == 12 */
-+#define QT_CONFIGURE_LICENSEE qt_configure_licensee_str + 12;
-+#define QT_CONFIGURE_LICENSED_PRODUCTS qt_configure_licensed_products_str + 12;
-+#define QT_CONFIGURE_PREFIX_PATH qt_configure_prefix_path_str + 12;
-+#define QT_CONFIGURE_DOCUMENTATION_PATH qt_configure_documentation_path_str + 12;
-+#define QT_CONFIGURE_HEADERS_PATH qt_configure_headers_path_str + 12;
-+#define QT_CONFIGURE_LIBRARIES_PATH qt_configure_libraries_path_str + 12;
-+#define QT_CONFIGURE_BINARIES_PATH qt_configure_binaries_path_str + 12;
-+#define QT_CONFIGURE_PLUGINS_PATH qt_configure_plugins_path_str + 12;
-+#define QT_CONFIGURE_DATA_PATH qt_configure_data_path_str + 12;
-+#define QT_CONFIGURE_TRANSLATIONS_PATH qt_configure_translations_path_str + 12;
-+#define QT_CONFIGURE_EXAMPLES_PATH qt_configure_examples_path_str + 12;
-+#define QT_CONFIGURE_DEMOS_PATH qt_configure_demos_path_str + 12;
-+
-diff -urN qt-win-opensource-src-4.5.0-rc1.orig/src/corelib/global/qconfig.h qt-win-opensource-src-4.5.0-rc1/src/corelib/global/qconfig.h
---- qt-win-opensource-src-4.5.0-rc1.orig/src/corelib/global/qconfig.h 1970-01-01 01:00:00.000000000 +0100
-+++ qt-win-opensource-src-4.5.0-rc1/src/corelib/global/qconfig.h 2009-02-21 11:25:13.000000000 +0000
-@@ -0,0 +1,102 @@
-+/* Everything */
-+
-+#ifndef QT_DLL
-+#define QT_DLL
-+#endif
-+
-+/* License information */
-+#define QT_PRODUCT_LICENSEE "Open Source"
-+#define QT_PRODUCT_LICENSE "OpenSource"
-+
-+// Qt Edition
-+#ifndef QT_EDITION
-+# define QT_EDITION QT_EDITION_OPENSOURCE
-+#endif
-+
-+#if (defined(_DEBUG) || defined(DEBUG))
-+# if (defined(WIN64) || defined(_WIN64) || defined(__WIN64__))
-+# define QT_BUILD_KEY "Windows x64 msvc debug full-config"
-+# else
-+# define QT_BUILD_KEY "Windows msvc debug full-config"
-+# endif
-+#else
-+# if (defined(WIN64) || defined(_WIN64) || defined(__WIN64__))
-+# define QT_BUILD_KEY "Windows x64 msvc release full-config"
-+# else
-+# define QT_BUILD_KEY "Windows msvc release full-config"
-+# endif
-+#endif
-+
-+/* Machine byte-order */
-+#define Q_BIG_ENDIAN 4321
-+#define Q_LITTLE_ENDIAN 1234
-+#define Q_BYTE_ORDER Q_LITTLE_ENDIAN
-+
-+// Compile time features
-+#define QT_ARCH_WINDOWS
-+#if defined(QT_GRAPHICSSYSTEM_RASTER) && defined(QT_NO_GRAPHICSSYSTEM_RASTER)
-+# undef QT_GRAPHICSSYSTEM_RASTER
-+#elif !defined(QT_GRAPHICSSYSTEM_RASTER)
-+# define QT_GRAPHICSSYSTEM_RASTER
-+#endif
-+
-+#if defined(QT_NO_DBUS) && defined(QT_DBUS)
-+# undef QT_NO_DBUS
-+#elif !defined(QT_NO_DBUS)
-+# define QT_NO_DBUS
-+#endif
-+
-+#if defined(QT_NO_DIRECT3D) && defined(QT_DIRECT3D)
-+# undef QT_NO_DIRECT3D
-+#elif !defined(QT_NO_DIRECT3D)
-+# define QT_NO_DIRECT3D
-+#endif
-+
-+#if defined(QT_NO_OPENSSL) && defined(QT_OPENSSL)
-+# undef QT_NO_OPENSSL
-+#elif !defined(QT_NO_OPENSSL)
-+# define QT_NO_OPENSSL
-+#endif
-+
-+#if defined(QT_NO_PHONON) && defined(QT_PHONON)
-+# undef QT_NO_PHONON
-+#elif !defined(QT_NO_PHONON)
-+# define QT_NO_PHONON
-+#endif
-+
-+#if defined(QT_NO_STYLE_GTK) && defined(QT_STYLE_GTK)
-+# undef QT_NO_STYLE_GTK
-+#elif !defined(QT_NO_STYLE_GTK)
-+# define QT_NO_STYLE_GTK
-+#endif
-+
-+#if defined(QT_NO_STYLE_WINDOWSCE) && defined(QT_STYLE_WINDOWSCE)
-+# undef QT_NO_STYLE_WINDOWSCE
-+#elif !defined(QT_NO_STYLE_WINDOWSCE)
-+# define QT_NO_STYLE_WINDOWSCE
-+#endif
-+
-+#if defined(QT_NO_STYLE_WINDOWSMOBILE) && defined(QT_STYLE_WINDOWSMOBILE)
-+# undef QT_NO_STYLE_WINDOWSMOBILE
-+#elif !defined(QT_NO_STYLE_WINDOWSMOBILE)
-+# 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
-+
git.annexia.org / fedora-mingw.git / blobdiff