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 \r
-+win32-g++ \r
++fedora-win32-cross \r
+-confirm-license \r
+-no-qmake \r
+-dont-process \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.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".
++\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.4.3/LICENSE.GPL2\r
++ or Z:/home/rjones/d/fedora-mingw--devel/qt-win/qt-win-opensource-src-4.4.3/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
++ 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
++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.4.3\r
++Build is done in............Z:\home\rjones\d\fedora-mingw--devel\qt-win\qt-win-opensource-src-4.4.3\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.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 @@
+#\r
-+# qmake configuration for win32-g++\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
+QMAKE_EXT_OBJ = .o\r
+QMAKE_EXT_RES = _res.o\r
+\r
-+QMAKE_CC = gcc\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 =\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_DEBUG = -g\r
+QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses\r
+\r
-+QMAKE_CXX = g++\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_EXCEPTIONS_OFF = -fno-exceptions\r
+\r
+QMAKE_INCDIR =\r
-+QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS]\r
-+QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS]\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 = g++\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_LIBS_COMPAT = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32\r
+QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain\r
+\r
-+!isEmpty(QMAKE_SH) {\r
-+ MINGW_IN_SHELL = 1\r
-+ QMAKE_DIR_SEP = /\r
-+ QMAKE_COPY = cp\r
-+ QMAKE_COPY_DIR = xcopy /s /q /y /i\r
-+ QMAKE_MOVE = mv\r
-+ QMAKE_DEL_FILE = rm\r
-+ QMAKE_MKDIR = mkdir\r
-+ QMAKE_DEL_DIR = rmdir\r
-+ QMAKE_CHK_DIR_EXISTS = test -d\r
-+} else {\r
-+ QMAKE_COPY = copy /y\r
-+ QMAKE_COPY_DIR = xcopy /s /q /y /i\r
-+ QMAKE_MOVE = move\r
-+ QMAKE_DEL_FILE = del\r
-+ QMAKE_MKDIR = mkdir\r
-+ QMAKE_DEL_DIR = rmdir\r
-+ QMAKE_CHK_DIR_EXISTS = if not exist\r
-+}\r
-+\r
-+QMAKE_MOC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}moc.exe\r
-+QMAKE_UIC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}uic.exe\r
-+QMAKE_IDC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}idc.exe\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 = ar -ru\r
-+QMAKE_RC = windres\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:/tmp/qt-win-opensource-src-4.4.3/mkspecs/win32-g++\r
++QMAKESPEC_ORIGINAL=Z:/home/rjones/d/fedora-mingw--devel/qt-win/qt-win-opensource-src-4.4.3/mkspecs/fedora-win32-cross\r
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 @@
+/****************************************************************************\r
+**\r
+#endif // QPLATFORMDEFS_H\r
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\r
+QT_ARCH = windows\r
+QT_EDITION = OpenSource\r
-+QT_CONFIG += release zlib png accessibility qt3support opengl ipv6 xmlpatterns webkit svg minimal-config small-config medium-config large-config full-config\r
++QT_CONFIG += release zlib png accessibility qt3support opengl ipv6 xmlpatterns svg minimal-config small-config medium-config large-config full-config\r
+#versioning \r
+QT_VERSION = 4.4.3\r
+QT_MAJOR_VERSION = 4\r
+QT_CE_C_RUNTIME = no\r
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\r
-+OBJECTS_DIR = tmp/obj/release_shared\r
-+MOC_DIR = tmp/moc/release_shared\r
-+RCC_DIR = tmp/rcc/release_shared\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 windowsxp windowsvista motif cde\r
++styles += windows plastique cleanlooks motif cde\r
+imageformat-plugins += gif tiff jpeg\r
-+TMPPATH = $$quote($$(INCLUDE))\r
-+QMAKE_INCDIR_POST += $$split(TMPPATH,";")\r
-+TMPPATH = $$quote($$(LIB))\r
-+QMAKE_LIBDIR_POST += $$split(TMPPATH,";")\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:/tmp/qt-win-opensource-src-4.4.3/mkspecs/win32-g++\r
++QMAKESPEC = Z:\home\rjones\d\fedora-mingw--devel\qt-win\qt-win-opensource-src-4.4.3\mkspecs\fedora-win32-cross\r
+ARCH = windows\r
-+QT_BUILD_TREE = Z:/tmp/qt-win-opensource-src-4.4.3\r
-+QT_SOURCE_TREE = Z:/tmp/qt-win-opensource-src-4.4.3\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
++QT_BUILD_TREE = Z:\home\rjones\d\fedora-mingw--devel\qt-win\qt-win-opensource-src-4.4.3\r
++QT_SOURCE_TREE = Z:\home\rjones\d\fedora-mingw--devel\qt-win\qt-win-opensource-src-4.4.3\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.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";
+
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
+
+#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
+
+# 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