From bb0d0ed22f660c4ffcaacdfecf68ac72138b70e1 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 1 Jan 1970 00:00:00 +0000 Subject: [PATCH] Rebase to Qt 4.5.0-rc1 in order to match Fedora native version. --- qt-win/mingw32-qt-4.4.3-atomic-volatile.patch | 20 ----- qt-win/mingw32-qt-4.4.3-subauth.patch | 11 --- qt-win/mingw32-qt-4.4.3-wininput.patch | 13 ---- qt-win/mingw32-qt-win.spec | 31 ++++---- qt-win/qt-win-configure.patch | 105 +++++++++++++++----------- qt-win/qt-win-configure.sh | 2 +- 6 files changed, 74 insertions(+), 108 deletions(-) delete mode 100644 qt-win/mingw32-qt-4.4.3-atomic-volatile.patch delete mode 100644 qt-win/mingw32-qt-4.4.3-subauth.patch delete mode 100644 qt-win/mingw32-qt-4.4.3-wininput.patch diff --git a/qt-win/mingw32-qt-4.4.3-atomic-volatile.patch b/qt-win/mingw32-qt-4.4.3-atomic-volatile.patch deleted file mode 100644 index 03efb4b..0000000 --- a/qt-win/mingw32-qt-4.4.3-atomic-volatile.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -ur qt-win-opensource-src-4.4.3.orig/src/corelib/arch/qatomic_windows.h qt-win-opensource-src-4.4.3/src/corelib/arch/qatomic_windows.h ---- qt-win-opensource-src-4.4.3.orig/src/corelib/arch/qatomic_windows.h 2008-09-27 10:00:54.000000000 +0100 -+++ qt-win-opensource-src-4.4.3/src/corelib/arch/qatomic_windows.h 2009-02-02 11:07:19.000000000 +0000 -@@ -384,11 +384,11 @@ - #else - - extern "C" { -- __declspec(dllimport) long __stdcall InterlockedCompareExchange(long *, long, long); -- __declspec(dllimport) long __stdcall InterlockedIncrement(long *); -- __declspec(dllimport) long __stdcall InterlockedDecrement(long *); -- __declspec(dllimport) long __stdcall InterlockedExchange(long *, long); -- __declspec(dllimport) long __stdcall InterlockedExchangeAdd(long *, long); -+ __declspec(dllimport) long __stdcall InterlockedCompareExchange(volatile long *, long, long); -+ __declspec(dllimport) long __stdcall InterlockedIncrement(volatile long *); -+ __declspec(dllimport) long __stdcall InterlockedDecrement(volatile long *); -+ __declspec(dllimport) long __stdcall InterlockedExchange(volatile long *, long); -+ __declspec(dllimport) long __stdcall InterlockedExchangeAdd(volatile long *, long); - } - - inline bool QBasicAtomicInt::ref() diff --git a/qt-win/mingw32-qt-4.4.3-subauth.patch b/qt-win/mingw32-qt-4.4.3-subauth.patch deleted file mode 100644 index 7871d51..0000000 --- a/qt-win/mingw32-qt-4.4.3-subauth.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ur qt-win-opensource-src-4.4.3.orig/src/corelib/io/qfsfileengine_win.cpp qt-win-opensource-src-4.4.3/src/corelib/io/qfsfileengine_win.cpp ---- qt-win-opensource-src-4.4.3.orig/src/corelib/io/qfsfileengine_win.cpp 2008-09-27 10:00:55.000000000 +0100 -+++ qt-win-opensource-src-4.4.3/src/corelib/io/qfsfileengine_win.cpp 2009-02-06 16:39:50.000000000 +0000 -@@ -65,6 +65,7 @@ - #include - #include - #define SECURITY_WIN32 -+#include - #include - - #ifndef _INTPTR_T_DEFINED diff --git a/qt-win/mingw32-qt-4.4.3-wininput.patch b/qt-win/mingw32-qt-4.4.3-wininput.patch deleted file mode 100644 index 38c4b8f..0000000 --- a/qt-win/mingw32-qt-4.4.3-wininput.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ur qt-win-opensource-src-4.4.3.orig/src/gui/inputmethod/qwininputcontext_win.cpp qt-win-opensource-src-4.4.3/src/gui/inputmethod/qwininputcontext_win.cpp ---- qt-win-opensource-src-4.4.3.orig/src/gui/inputmethod/qwininputcontext_win.cpp 2008-09-27 10:00:55.000000000 +0100 -+++ qt-win-opensource-src-4.4.3/src/gui/inputmethod/qwininputcontext_win.cpp 2009-02-02 12:19:10.000000000 +0000 -@@ -497,6 +497,9 @@ - } - - -+// http://lists.trolltech.com/qt-interest/2008-05/thread00666-0.html -+extern bool qt_sendSpontaneousEvent(QObject *, QEvent *); -+ - bool QWinInputContext::endComposition() - { - QWidget *fw = focusWidget(); diff --git a/qt-win/mingw32-qt-win.spec b/qt-win/mingw32-qt-win.spec index b880d04..1701731 100644 --- a/qt-win/mingw32-qt-win.spec +++ b/qt-win/mingw32-qt-win.spec @@ -16,15 +16,15 @@ %define subdirs src/corelib src/xml src/network src/gui src/winmain Name: mingw32-qt-win -Version: 4.4.3 -Release: 4%{?dist} +Version: 4.5.0 +Release: 0.1.rc1.%{?dist} Summary: Qt for Windows License: GPLv2+ Group: Development/Libraries URL: http://www.qtsoftware.com/ -Source0: ftp://ftp.trolltech.no/qt/source/qt-win-opensource-src-%{version}.zip +Source0: ftp://ftp.trolltech.no/qt/source/qt-win-opensource-src-%{version}-rc1.zip # To make the configure patch - see below. Source1: qt-win-configure.sh @@ -44,15 +44,7 @@ Source4: qplatformdefs.h # Generate this patch using "qt-win-configure.sh". Patch0: qt-win-configure.patch -# The released source contains multiple, blatant build bugs which have -# been fixed (further) upstream months ago. Urgghhh. These patches -# fix them. -Patch10: mingw32-qt-4.4.3-atomic-volatile.patch Patch11: mingw32-qt-4.4.3-no-fpu-functions.patch -Patch12: mingw32-qt-4.4.3-wininput.patch - -# http://lists-archives.org/mingw-users/11845-problem-compile-qt-4-4-2-with-latest-w32api.html -Patch20: mingw32-qt-4.4.3-subauth.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -63,7 +55,11 @@ BuildRequires: mingw32-gcc-c++ BuildRequires: mingw32-binutils # For the native qmake, moc programs. +# Note that the precise same native version is required - eg. moc will +# not work unless it's the same version. +#BuildRequires: qt-devel = %{version} Stupid, can't write this ... BuildRequires: qt-devel + BuildRequires: zip BuildRequires: dos2unix @@ -82,17 +78,13 @@ Fedora Windows cross-compiler. %prep -%setup -q -n qt-win-opensource-src-%{version} +%setup -q -n qt-win-opensource-src-%{version}-rc1 %patch0 -p1 -%patch10 -p1 %patch11 -p1 -%patch12 -p1 -%patch20 -p1 - -for f in changes-%{version} LICENSE.GPL2 LICENSE.GPL3 GPL_EXCEPTION_ADDENDUM.TXT GPL_EXCEPTION.TXT OPENSOURCE-NOTICE.TXT README; do +for f in LICENSE.GPL2 LICENSE.GPL3 GPL_EXCEPTION_ADDENDUM.TXT GPL_EXCEPTION.TXT OPENSOURCE-NOTICE.TXT README; do dos2unix --keepdate $f done @@ -163,7 +155,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -%doc changes-%{version} configure.output +%doc configure.output %doc LICENSE.GPL2 LICENSE.GPL3 GPL_EXCEPTION_ADDENDUM.TXT GPL_EXCEPTION.TXT %doc OPENSOURCE-NOTICE.TXT README %{_mingw32_bindir}/QtCore4.dll @@ -184,6 +176,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Feb 21 2009 Richard W.M. Jones - 4.5.0-0.1.rc1 +- Update to Qt 4.5.0-rc1. + * Fri Feb 20 2009 Richard W.M. Jones - 4.4.3-4 - Rebuild for mingw32-gcc 4.4 diff --git a/qt-win/qt-win-configure.patch b/qt-win/qt-win-configure.patch index f2cc53f..f081098 100644 --- a/qt-win/qt-win-configure.patch +++ b/qt-win/qt-win-configure.patch @@ -1,6 +1,6 @@ -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-02 14:39:05.000000000 +0000 +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 +fedora-win32-cross @@ -32,11 +32,11 @@ diff -urN qt-win-opensource-src-4.4.3.orig/configure.cache qt-win-opensource-src +-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". +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". + +This is the Qt for Windows Open Source Edition. + @@ -60,8 +60,8 @@ diff -urN qt-win-opensource-src-4.4.3.orig/configure.output qt-win-opensource-sr + 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 ++See Z:/home/rjones/d/fedora-mingw--devel/qt-win/qt-win-opensource-src-4.5.0-rc1/LICENSE.GPL2 ++ or Z:/home/rjones/d/fedora-mingw--devel/qt-win/qt-win-opensource-src-4.5.0-rc1/LICENSE.GPL3 + +Configuration: + dist-config @@ -79,6 +79,7 @@ diff -urN qt-win-opensource-src-4.4.3.orig/configure.output qt-win-opensource-sr + qt3support + opengl + ipv6 ++ scripttools + xmlpatterns + svg + minimal-config @@ -107,6 +108,8 @@ diff -urN qt-win-opensource-src-4.4.3.orig/configure.output qt-win-opensource-sr +QtXmlPatterns support.......yes +Phonon support..............no +WebKit support..............no ++QtScriptTools support.......yes ++Graphics System.............raster +Qt3 compatibility...........yes + +Third Party Libraries: @@ -139,8 +142,8 @@ diff -urN qt-win-opensource-src-4.4.3.orig/configure.output qt-win-opensource-sr + 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 ++Sources are in..............Z:\home\rjones\d\fedora-mingw--devel\qt-win\qt-win-opensource-src-4.5.0-rc1 ++Build is done in............Z:\home\rjones\d\fedora-mingw--devel\qt-win\qt-win-opensource-src-4.5.0-rc1 +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 @@ -155,19 +158,19 @@ diff -urN qt-win-opensource-src-4.4.3.orig/configure.output qt-win-opensource-sr +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-02 14:39:05.000000000 +0000 +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.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-02 14:39:05.000000000 +0000 +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.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-02 14:39:05.000000000 +0000 +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 @@ +# +# qmake configuration for fedora-win32-cross @@ -277,10 +280,10 @@ diff -urN qt-win-opensource-src-4.4.3.orig/mkspecs/default/qmake.conf qt-win-ope +QMAKE_STRIPFLAGS_LIB += --strip-unneeded +load(qt_config) + -+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 2009-02-02 14:39:01.000000000 +0000 ++QMAKESPEC_ORIGINAL=Z:/home/rjones/d/fedora-mingw--devel/qt-win/qt-win-opensource-src-4.5.0-rc1/mkspecs/fedora-win32-cross +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 @@ +/**************************************************************************** +** @@ -442,24 +445,24 @@ 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-02 14:39:05.000000000 +0000 +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 +QT_ARCH = windows +QT_EDITION = OpenSource -+QT_CONFIG += release zlib png accessibility qt3support opengl ipv6 xmlpatterns svg minimal-config small-config medium-config large-config full-config ++QT_CONFIG += release zlib png accessibility qt3support opengl ipv6 scripttools xmlpatterns svg minimal-config small-config medium-config large-config full-config +#versioning -+QT_VERSION = 4.4.3 ++QT_VERSION = 4.5.0-rc1 +QT_MAJOR_VERSION = 4 -+QT_MINOR_VERSION = 4 -+QT_PATCH_VERSION = 3 ++QT_MINOR_VERSION = 5 ++QT_PATCH_VERSION = 0 +#Qt for Windows CE c-runtime deployment +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-02 14:39:05.000000000 +0000 +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 +OBJECTS_DIR = tmp\obj\release_shared @@ -470,10 +473,10 @@ diff -urN qt-win-opensource-src-4.4.3.orig/.qmake.cache qt-win-opensource-src-4. +imageformat-plugins += gif tiff jpeg +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:\home\rjones\d\fedora-mingw--devel\qt-win\qt-win-opensource-src-4.4.3\mkspecs\fedora-win32-cross ++QMAKESPEC = Z:\home\rjones\d\fedora-mingw--devel\qt-win\qt-win-opensource-src-4.5.0-rc1\mkspecs\fedora-win32-cross +ARCH = windows -+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 ++QT_BUILD_TREE = Z:\home\rjones\d\fedora-mingw--devel\qt-win\qt-win-opensource-src-4.5.0-rc1 ++QT_SOURCE_TREE = Z:\home\rjones\d\fedora-mingw--devel\qt-win\qt-win-opensource-src-4.5.0-rc1 +QMAKE_MOC = $$QT_BUILD_TREE\bin\moc.exe +QMAKE_UIC = $$QT_BUILD_TREE\bin\uic.exe +QMAKE_UIC3 = $$QT_BUILD_TREE\bin\uic3.exe @@ -481,9 +484,9 @@ diff -urN qt-win-opensource-src-4.4.3.orig/.qmake.cache qt-win-opensource-src-4. +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-02 14:39:05.000000000 +0000 +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"; @@ -512,10 +515,10 @@ diff -urN qt-win-opensource-src-4.4.3.orig/src/corelib/global/qconfig.cpp qt-win +#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.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-02 14:39:05.000000000 +0000 -@@ -0,0 +1,90 @@ +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 @@ -552,6 +555,12 @@ diff -urN qt-win-opensource-src-4.4.3.orig/src/corelib/global/qconfig.h qt-win-o + +// 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) @@ -576,6 +585,12 @@ diff -urN qt-win-opensource-src-4.4.3.orig/src/corelib/global/qconfig.h qt-win-o +# 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) diff --git a/qt-win/qt-win-configure.sh b/qt-win/qt-win-configure.sh index d6719e6..3bfab93 100755 --- a/qt-win/qt-win-configure.sh +++ b/qt-win/qt-win-configure.sh @@ -15,7 +15,7 @@ # error: #error "MMX instruction set not enabled" # . Same as above for -no-sse and -no-sse2 -version=4.4.3 +version=4.5.0-rc1 platform=fedora-win32-cross set -e -- 1.8.3.1