1 diff -urN qt-win-opensource-src-4.5.0-rc1.orig/configure.cache qt-win-opensource-src-4.5.0-rc1/configure.cache
2 --- qt-win-opensource-src-4.5.0-rc1.orig/configure.cache 1970-01-01 01:00:00.000000000 +0100
3 +++ qt-win-opensource-src-4.5.0-rc1/configure.cache 2009-02-21 11:25:13.000000000 +0000
11 +/usr/i686-pc-mingw32/sys-root/mingw
\r
13 +/usr/i686-pc-mingw32/sys-root/mingw/bin
\r
15 +/usr/i686-pc-mingw32/sys-root/mingw/share
\r
17 +/usr/i686-pc-mingw32/sys-root/mingw/lib/qt4/demos
\r
19 +/usr/i686-pc-mingw32/sys-root/mingw/share/doc
\r
21 +/usr/i686-pc-mingw32/sys-root/mingw/share/qt4/examples
\r
23 +/usr/i686-pc-mingw32/sys-root/mingw/include
\r
25 +/usr/i686-pc-mingw32/sys-root/mingw/lib
\r
27 +/usr/i686-pc-mingw32/sys-root/mingw/lib/qt4/plugins
\r
29 +/usr/i686-pc-mingw32/sys-root/mingw/share/qt4/translations
\r
35 diff -urN qt-win-opensource-src-4.5.0-rc1.orig/configure.output qt-win-opensource-src-4.5.0-rc1/configure.output
36 --- qt-win-opensource-src-4.5.0-rc1.orig/configure.output 1970-01-01 01:00:00.000000000 +0100
37 +++ qt-win-opensource-src-4.5.0-rc1/configure.output 2009-02-21 11:25:13.000000000 +0000
39 +Xlib: extension "Generic Event Extension" missing on display "localhost:13.0".
41 +This is the Qt for Windows Open Source Edition.
\r
43 +You have already accepted the terms of the license.
\r
45 +Setting Direct3D to NO, since the proper Direct3D SDK was not detected.
\r
46 +Make sure you have the Direct3D SDK installed, and that you have run
\r
47 +the <path to SDK>\Utilities\Bin\dx_setenv.cmd script.
\r
48 +The D3D SDK library path *needs* to appear before the Platform SDK library
\r
49 +path in your LIB environment variable.
\r
50 +All the required DirectShow/Direct3D files couldn't be found.
\r
51 +Make sure you have either the platform SDK AND the DirectX SDK or the Windows SDK installed.
\r
52 +If you have the DirectX SDK installed, please make sure that you have run the <path to SDK>\SetEnv.Cmd script.
\r
59 + C:\windows\system32
\r\r
61 + Z:\usr\i686-pc-mingw32\sys-root\mingw\bin
\r
62 +You are licensed to use this software under the terms of the GNU GPL version 2 or 3.
\r
63 +See Z:/home/rjones/d/fedora-mingw--devel/qt-win/qt-win-opensource-src-4.5.0-rc1/LICENSE.GPL2
\r
64 + or Z:/home/rjones/d/fedora-mingw--devel/qt-win/qt-win-opensource-src-4.5.0-rc1/LICENSE.GPL3
\r
91 +QMAKESPEC...................fedora-win32-cross (commandline)
\r
92 +Architecture................windows
\r
93 +Maketool....................make
\r
94 +Debug symbols...............no
\r
95 +Accessibility support.......yes
\r
96 +STL support.................yes
\r
97 +Exception support...........yes
\r
98 +RTTI support................yes
\r
99 +MMX support.................no
\r
100 +3DNOW support...............no
\r
101 +SSE support.................no
\r
102 +SSE2 support................no
\r
103 +IWMMXT support..............no
\r
104 +OpenGL support..............yes
\r
105 +Direct3D support............no
\r
106 +OpenSSL support.............no
\r
107 +QtDBus support..............no
\r
108 +QtXmlPatterns support.......yes
\r
109 +Phonon support..............no
\r
110 +WebKit support..............no
\r
111 +QtScriptTools support.......yes
\r
112 +Graphics System.............raster
\r
113 +Qt3 compatibility...........yes
\r
115 +Third Party Libraries:
\r
116 + ZLIB support............qt
\r
117 + GIF support.............plugin
\r
118 + TIFF support............plugin
\r
119 + JPEG support............plugin
\r
120 + PNG support.............qt
\r
121 + MNG support.............plugin
\r
124 + Windows.................yes
\r
125 + Windows XP..............no
\r
126 + Windows Vista...........no
\r
127 + Plastique...............yes
\r
128 + Cleanlooks..............yes
\r
129 + Motif...................yes
\r
130 + CDE.....................yes
\r
131 + Windows CE..............no
\r
132 + Windows Mobile..........no
\r
135 + ODBC....................no
\r
136 + MySQL...................no
\r
137 + OCI.....................no
\r
138 + PostgreSQL..............no
\r
139 + TDS.....................no
\r
140 + DB2.....................no
\r
141 + SQLite..................plugin (qt)
\r
142 + SQLite2.................no
\r
143 + InterBase...............no
\r
145 +Sources are in..............Z:\home\rjones\d\fedora-mingw--devel\qt-win\qt-win-opensource-src-4.5.0-rc1
\r
146 +Build is done in............Z:\home\rjones\d\fedora-mingw--devel\qt-win\qt-win-opensource-src-4.5.0-rc1
\r
147 +Install prefix............../usr/i686-pc-mingw32/sys-root/mingw
\r
148 +Headers installed to......../usr/i686-pc-mingw32/sys-root/mingw/include
\r
149 +Libraries installed to....../usr/i686-pc-mingw32/sys-root/mingw/lib
\r
150 +Plugins installed to......../usr/i686-pc-mingw32/sys-root/mingw/lib/qt4/plugins
\r
151 +Binaries installed to......./usr/i686-pc-mingw32/sys-root/mingw/bin
\r
152 +Docs installed to.........../usr/i686-pc-mingw32/sys-root/mingw/share/doc
\r
153 +Data installed to.........../usr/i686-pc-mingw32/sys-root/mingw/share
\r
154 +Translations installed to.../usr/i686-pc-mingw32/sys-root/mingw/share/qt4/translations
\r
155 +Examples installed to......./usr/i686-pc-mingw32/sys-root/mingw/share/qt4/examples
\r
156 +Demos installed to........../usr/i686-pc-mingw32/sys-root/mingw/lib/qt4/demos
\r
158 +Processing of project files have been disabled.
\r
159 +Only use this option if you really know what you're doing.
\r
161 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
162 --- qt-win-opensource-src-4.5.0-rc1.orig/include/Qt/qconfig.h 1970-01-01 01:00:00.000000000 +0100
163 +++ qt-win-opensource-src-4.5.0-rc1/include/Qt/qconfig.h 2009-02-21 11:25:13.000000000 +0000
165 +#include "../../src/corelib/global/qconfig.h"
166 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
167 --- qt-win-opensource-src-4.5.0-rc1.orig/include/QtCore/qconfig.h 1970-01-01 01:00:00.000000000 +0100
168 +++ qt-win-opensource-src-4.5.0-rc1/include/QtCore/qconfig.h 2009-02-21 11:25:13.000000000 +0000
170 +#include "../../src/corelib/global/qconfig.h"
171 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
172 --- qt-win-opensource-src-4.5.0-rc1.orig/mkspecs/default/qmake.conf 1970-01-01 01:00:00.000000000 +0100
173 +++ qt-win-opensource-src-4.5.0-rc1/mkspecs/default/qmake.conf 2009-02-21 11:25:13.000000000 +0000
176 +# qmake configuration for fedora-win32-cross
\r
177 +# (Fedora Windows cross-compiler)
\r
178 +# by Richard W.M. Jones (rjones@redhat.com)
\r
180 +# Written for MinGW
\r
183 +MAKEFILE_GENERATOR = MINGW
\r
185 +CONFIG += qt warn_on release link_prl copy_dir_files debug_and_release debug_and_release_target precompile_header
\r
187 +DEFINES += UNICODE QT_LARGEFILE_SUPPORT
\r
188 +QMAKE_COMPILER_DEFINES += __GNUC__ WIN32
\r
190 +QMAKE_EXT_OBJ = .o
\r
191 +QMAKE_EXT_RES = _res.o
\r
193 +QMAKE_CC = i686-pc-mingw32-gcc
\r
196 +QMAKE_YACC = byacc
\r
197 +QMAKE_YACCFLAGS = -d
\r
198 +QMAKE_CFLAGS = -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 --param=ssp-buffer-size=4 -mms-bitfields
\r
199 +QMAKE_CFLAGS_DEPS = -M
\r
200 +QMAKE_CFLAGS_WARN_ON = -Wall
\r
201 +QMAKE_CFLAGS_WARN_OFF = -w
\r
202 +QMAKE_CFLAGS_RELEASE = -O2
\r
203 +QMAKE_CFLAGS_DEBUG = -g
\r
204 +QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses
\r
206 +QMAKE_CXX = i686-pc-mingw32-g++
\r
207 +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS
\r
208 +QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS
\r
209 +QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
\r
210 +QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
\r
211 +QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE
\r
212 +QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG
\r
213 +QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC
\r
214 +QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD
\r
215 +QMAKE_CXXFLAGS_RTTI_ON = -frtti
\r
216 +QMAKE_CXXFLAGS_RTTI_OFF = -fno-rtti
\r
217 +QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions -mthreads
\r
218 +QMAKE_CXXFLAGS_EXCEPTIONS_OFF = -fno-exceptions
\r
221 +#QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS]
\r
222 +QMAKE_INCDIR_QT = /usr/i686-pc-mingw32/sys-root/mingw/include
\r
223 +#QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS]
\r
224 +QMAKE_LIBDIR_QT = /usr/i686-pc-mingw32/sys-root/mingw/lib
\r
226 +QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -o $obj $src
\r
227 +QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
\r
228 +QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src
\r
229 +QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
\r
231 +QMAKE_LINK = i686-pc-mingw32-g++
\r
232 +QMAKE_LFLAGS = -enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc
\r
233 +QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads -Wl
\r
234 +QMAKE_LFLAGS_EXCEPTIONS_OFF =
\r
235 +QMAKE_LFLAGS_RELEASE = -Wl,-s
\r
236 +QMAKE_LFLAGS_DEBUG =
\r
237 +QMAKE_LFLAGS_CONSOLE = -Wl,-subsystem,console
\r
238 +QMAKE_LFLAGS_WINDOWS = -Wl,-subsystem,windows
\r
239 +QMAKE_LFLAGS_DLL = -shared
\r
240 +QMAKE_LINK_OBJECT_MAX = 10
\r
241 +QMAKE_LINK_OBJECT_SCRIPT= object_script
\r
245 +QMAKE_LIBS_CORE = -lkernel32 -luser32 -lshell32 -luuid -lole32 -ladvapi32 -lws2_32
\r
246 +QMAKE_LIBS_GUI = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lwinspool -lws2_32 -lole32 -luuid -luser32 -ladvapi32
\r
247 +QMAKE_LIBS_NETWORK = -lws2_32
\r
248 +QMAKE_LIBS_OPENGL = -lopengl32 -lglu32 -lgdi32 -luser32
\r
249 +QMAKE_LIBS_COMPAT = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32
\r
250 +QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain
\r
253 +QMAKE_COPY = cp -f
\r
254 +QMAKE_COPY_FILE = $(COPY)
\r
255 +QMAKE_COPY_DIR = $(COPY) -a
\r
256 +QMAKE_MOVE = mv -f
\r
257 +QMAKE_DEL_FILE = rm -f
\r
258 +QMAKE_DEL_DIR = rmdir
\r
259 +QMAKE_STRIP = strip
\r
260 +QMAKE_STRIPFLAGS_LIB += --strip-unneeded
\r
261 +QMAKE_INSTALL_FILE = install -m 644 -p
\r
262 +QMAKE_INSTALL_PROGRAM = install -m 755 -p
\r
264 +# "qmake -win32" always appears to generate code like this:
\r
265 +# $(CHK_DIR_EXISTS) somedir $(MKDIR) somedir
\r
266 +# We can't write a Unix macro that is compatible, so we have to hack it:
\r
267 +QMAKE_CHK_DIR_EXISTS = mkdir -p
\r
270 +QMAKE_MOC = moc-qt4
\r
271 +QMAKE_UIC = uic-qt4
\r
275 +QMAKE_LIB = i686-pc-mingw32-ar -ru
\r
276 +QMAKE_RC = i686-pc-mingw32-windres
\r
277 +QMAKE_ZIP = zip -r -9
\r
279 +QMAKE_STRIP = strip
\r
280 +QMAKE_STRIPFLAGS_LIB += --strip-unneeded
\r
283 +QMAKESPEC_ORIGINAL=Z:/home/rjones/d/fedora-mingw--devel/qt-win/qt-win-opensource-src-4.5.0-rc1/mkspecs/fedora-win32-cross
\r
284 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
285 --- qt-win-opensource-src-4.5.0-rc1.orig/mkspecs/default/qplatformdefs.h 1970-01-01 01:00:00.000000000 +0100
286 +++ qt-win-opensource-src-4.5.0-rc1/mkspecs/default/qplatformdefs.h 2009-02-21 11:25:06.000000000 +0000
288 +/****************************************************************************
\r
290 +** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
\r
291 +** Contact: Qt Software Information (qt-info@nokia.com)
\r
293 +** This file is part of the qmake spec of the Qt Toolkit.
\r
295 +** Commercial Usage
\r
296 +** Licensees holding valid Qt Commercial licenses may use this file in
\r
297 +** accordance with the Qt Commercial License Agreement provided with the
\r
298 +** Software or, alternatively, in accordance with the terms contained in
\r
299 +** a written agreement between you and Nokia.
\r
302 +** GNU General Public License Usage
\r
303 +** Alternatively, this file may be used under the terms of the GNU
\r
304 +** General Public License versions 2.0 or 3.0 as published by the Free
\r
305 +** Software Foundation and appearing in the file LICENSE.GPL included in
\r
306 +** the packaging of this file. Please review the following information
\r
307 +** to ensure GNU General Public Licensing requirements will be met:
\r
308 +** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
\r
309 +** http://www.gnu.org/copyleft/gpl.html. In addition, as a special
\r
310 +** exception, Nokia gives you certain additional rights. These rights
\r
311 +** are described in the Nokia Qt GPL Exception version 1.3, included in
\r
312 +** the file GPL_EXCEPTION.txt in this package.
\r
314 +** Qt for Windows(R) Licensees
\r
315 +** As a special exception, Nokia, as the sole copyright holder for Qt
\r
316 +** Designer, grants users of the Qt/Eclipse Integration plug-in the
\r
317 +** right for the Qt/Eclipse Integration to link to functionality
\r
318 +** provided by Qt Designer and its related libraries.
\r
320 +** If you are unsure which license is appropriate for your use, please
\r
321 +** contact the sales department at qt-sales@nokia.com.
\r
323 +****************************************************************************/
\r
325 +#ifndef QPLATFORMDEFS_H
\r
326 +#define QPLATFORMDEFS_H
\r
334 +// Get Qt defines/settings
\r
336 +#include "qglobal.h"
\r
338 +#include <tchar.h>
\r
340 +#include <direct.h>
\r
341 +#include <stdio.h>
\r
342 +#include <fcntl.h>
\r
343 +#include <errno.h>
\r
344 +#include <sys/stat.h>
\r
345 +#include <stdlib.h>
\r
346 +#include <windows.h>
\r
347 +#include <limits.h>
\r
349 +#if !defined(_WIN32_WINNT) || (_WIN32_WINNT-0 < 0x0500)
\r
351 + NameUnknown = 0,
\r
352 + NameFullyQualifiedDN = 1,
\r
353 + NameSamCompatible = 2,
\r
354 + NameDisplay = 3,
\r
355 + NameUniqueId = 6,
\r
356 + NameCanonical = 7,
\r
357 + NameUserPrincipal = 8,
\r
358 + NameCanonicalEx = 9,
\r
359 + NameServicePrincipal = 10,
\r
360 + NameDnsDomain = 12
\r
361 +} EXTENDED_NAME_FORMAT, *PEXTENDED_NAME_FORMAT;
\r
365 +#ifdef QT_LARGEFILE_SUPPORT
\r
366 +#define QT_STATBUF struct _stati64 // non-ANSI defs
\r
367 +#define QT_STATBUF4TSTAT struct _stati64 // non-ANSI defs
\r
368 +#define QT_STAT ::_stati64
\r
369 +#define QT_FSTAT ::_fstati64
\r
371 +#define QT_STATBUF struct _stat // non-ANSI defs
\r
372 +#define QT_STATBUF4TSTAT struct _stat // non-ANSI defs
\r
373 +#define QT_STAT ::_stat
\r
374 +#define QT_FSTAT ::_fstat
\r
376 +#define QT_STAT_REG _S_IFREG
\r
377 +#define QT_STAT_DIR _S_IFDIR
\r
378 +#define QT_STAT_MASK _S_IFMT
\r
379 +#if defined(_S_IFLNK)
\r
380 +# define QT_STAT_LNK _S_IFLNK
\r
382 +#define QT_FILENO _fileno
\r
383 +#define QT_OPEN ::_open
\r
384 +#define QT_CLOSE ::_close
\r
385 +#ifdef QT_LARGEFILE_SUPPORT
\r
386 +#define QT_LSEEK ::_lseeki64
\r
388 +#define QT_TSTAT ::_stati64
\r
390 +#define QT_TSTAT ::_wstati64
\r
393 +#define QT_LSEEK ::_lseek
\r
395 +#define QT_TSTAT ::_stat
\r
397 +#define QT_TSTAT ::_wstat
\r
400 +#define QT_READ ::_read
\r
401 +#define QT_WRITE ::_write
\r
402 +#define QT_ACCESS ::_access
\r
403 +#define QT_GETCWD ::_getcwd
\r
404 +#define QT_CHDIR ::_chdir
\r
405 +#define QT_MKDIR ::_mkdir
\r
406 +#define QT_RMDIR ::_rmdir
\r
407 +#define QT_OPEN_LARGEFILE 0
\r
408 +#define QT_OPEN_RDONLY _O_RDONLY
\r
409 +#define QT_OPEN_WRONLY _O_WRONLY
\r
410 +#define QT_OPEN_RDWR _O_RDWR
\r
411 +#define QT_OPEN_CREAT _O_CREAT
\r
412 +#define QT_OPEN_TRUNC _O_TRUNC
\r
413 +#define QT_OPEN_APPEND _O_APPEND
\r
414 +#if defined(O_TEXT)
\r
415 +# define QT_OPEN_TEXT _O_TEXT
\r
416 +# define QT_OPEN_BINARY _O_BINARY
\r
419 +#define QT_FOPEN ::fopen
\r
420 +#ifdef QT_LARGEFILE_SUPPORT
\r
421 +#define QT_FSEEK ::fseeko64
\r
422 +#define QT_FTELL ::ftello64
\r
424 +#define QT_FSEEK ::fseek
\r
425 +#define QT_FTELL ::ftell
\r
427 +#define QT_FGETPOS ::fgetpos
\r
428 +#define QT_FSETPOS ::fsetpos
\r
429 +#define QT_FPOS_T fpos_t
\r
430 +#ifdef QT_LARGEFILE_SUPPORT
\r
431 +#define QT_OFF_T off64_t
\r
433 +#define QT_OFF_T long
\r
436 +#define QT_SIGNAL_ARGS int
\r
438 +#define QT_VSNPRINTF ::_vsnprintf
\r
439 +#define QT_SNPRINTF ::_snprintf
\r
447 +#endif // QPLATFORMDEFS_H
\r
448 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
449 --- qt-win-opensource-src-4.5.0-rc1.orig/mkspecs/qconfig.pri 1970-01-01 01:00:00.000000000 +0100
450 +++ qt-win-opensource-src-4.5.0-rc1/mkspecs/qconfig.pri 2009-02-21 11:25:13.000000000 +0000
452 +CONFIG+= release shared stl exceptions rtti
\r
454 +QT_EDITION = OpenSource
\r
455 +QT_CONFIG += release zlib png accessibility qt3support opengl ipv6 scripttools xmlpatterns svg minimal-config small-config medium-config large-config full-config
\r
457 +QT_VERSION = 4.5.0-rc1
\r
458 +QT_MAJOR_VERSION = 4
\r
459 +QT_MINOR_VERSION = 5
\r
460 +QT_PATCH_VERSION = 0
\r
461 +#Qt for Windows CE c-runtime deployment
\r
462 +QT_CE_C_RUNTIME = no
\r
463 diff -urN qt-win-opensource-src-4.5.0-rc1.orig/.qmake.cache qt-win-opensource-src-4.5.0-rc1/.qmake.cache
464 --- qt-win-opensource-src-4.5.0-rc1.orig/.qmake.cache 1970-01-01 01:00:00.000000000 +0100
465 +++ qt-win-opensource-src-4.5.0-rc1/.qmake.cache 2009-02-21 11:25:13.000000000 +0000
467 +QMAKE_QT_VERSION_OVERRIDE = 4
\r
468 +OBJECTS_DIR = tmp\obj\release_shared
\r
469 +MOC_DIR = tmp\moc\release_shared
\r
470 +RCC_DIR = tmp\rcc\release_shared
\r
471 +sql-plugins += sqlite
\r
472 +styles += windows plastique cleanlooks motif cde
\r
473 +imageformat-plugins += gif tiff jpeg
\r
474 +CONFIG += dist-config large-config medium-config minimal-config small-config full-config release incremental create_prl link_prl depend_includepath QTDIR_build
\r
475 +QT_BUILD_PARTS = libs tools examples demos docs translations
\r
476 +QMAKESPEC = Z:\home\rjones\d\fedora-mingw--devel\qt-win\qt-win-opensource-src-4.5.0-rc1\mkspecs\fedora-win32-cross
\r
478 +QT_BUILD_TREE = Z:\home\rjones\d\fedora-mingw--devel\qt-win\qt-win-opensource-src-4.5.0-rc1
\r
479 +QT_SOURCE_TREE = Z:\home\rjones\d\fedora-mingw--devel\qt-win\qt-win-opensource-src-4.5.0-rc1
\r
480 +QMAKE_MOC = $$QT_BUILD_TREE\bin\moc.exe
\r
481 +QMAKE_UIC = $$QT_BUILD_TREE\bin\uic.exe
\r
482 +QMAKE_UIC3 = $$QT_BUILD_TREE\bin\uic3.exe
\r
483 +QMAKE_RCC = $$QT_BUILD_TREE\bin\rcc.exe
\r
484 +QMAKE_DUMPCPP = $$QT_BUILD_TREE\bin\dumpcpp.exe
\r
485 +QMAKE_INCDIR_QT = $$QT_BUILD_TREE\include
\r
486 +QMAKE_LIBDIR_QT = $$QT_BUILD_TREE\lib
\r
487 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
488 --- qt-win-opensource-src-4.5.0-rc1.orig/src/corelib/global/qconfig.cpp 1970-01-01 01:00:00.000000000 +0100
489 +++ qt-win-opensource-src-4.5.0-rc1/src/corelib/global/qconfig.cpp 2009-02-21 11:25:13.000000000 +0000
492 +static const char qt_configure_licensee_str [512 + 12] = "qt_lcnsuser=Open Source";
493 +static const char qt_configure_licensed_products_str [512 + 12] = "qt_lcnsprod=OpenSource";
494 +static const char qt_configure_prefix_path_str [512 + 12] = "qt_prfxpath=/usr/i686-pc-mingw32/sys-root/mingw";
495 +static const char qt_configure_documentation_path_str[512 + 12] = "qt_docspath=/usr/i686-pc-mingw32/sys-root/mingw/share/doc";
496 +static const char qt_configure_headers_path_str [512 + 12] = "qt_hdrspath=/usr/i686-pc-mingw32/sys-root/mingw/include";
497 +static const char qt_configure_libraries_path_str [512 + 12] = "qt_libspath=/usr/i686-pc-mingw32/sys-root/mingw/lib";
498 +static const char qt_configure_binaries_path_str [512 + 12] = "qt_binspath=/usr/i686-pc-mingw32/sys-root/mingw/bin";
499 +static const char qt_configure_plugins_path_str [512 + 12] = "qt_plugpath=/usr/i686-pc-mingw32/sys-root/mingw/lib/qt4/plugins";
500 +static const char qt_configure_data_path_str [512 + 12] = "qt_datapath=/usr/i686-pc-mingw32/sys-root/mingw/share";
501 +static const char qt_configure_translations_path_str [512 + 12] = "qt_trnspath=/usr/i686-pc-mingw32/sys-root/mingw/share/qt4/translations";
502 +static const char qt_configure_examples_path_str [512 + 12] = "qt_xmplpath=/usr/i686-pc-mingw32/sys-root/mingw/share/qt4/examples";
503 +static const char qt_configure_demos_path_str [512 + 12] = "qt_demopath=/usr/i686-pc-mingw32/sys-root/mingw/lib/qt4/demos";
504 +/* strlen( "qt_lcnsxxxx" ) == 12 */
505 +#define QT_CONFIGURE_LICENSEE qt_configure_licensee_str + 12;
506 +#define QT_CONFIGURE_LICENSED_PRODUCTS qt_configure_licensed_products_str + 12;
507 +#define QT_CONFIGURE_PREFIX_PATH qt_configure_prefix_path_str + 12;
508 +#define QT_CONFIGURE_DOCUMENTATION_PATH qt_configure_documentation_path_str + 12;
509 +#define QT_CONFIGURE_HEADERS_PATH qt_configure_headers_path_str + 12;
510 +#define QT_CONFIGURE_LIBRARIES_PATH qt_configure_libraries_path_str + 12;
511 +#define QT_CONFIGURE_BINARIES_PATH qt_configure_binaries_path_str + 12;
512 +#define QT_CONFIGURE_PLUGINS_PATH qt_configure_plugins_path_str + 12;
513 +#define QT_CONFIGURE_DATA_PATH qt_configure_data_path_str + 12;
514 +#define QT_CONFIGURE_TRANSLATIONS_PATH qt_configure_translations_path_str + 12;
515 +#define QT_CONFIGURE_EXAMPLES_PATH qt_configure_examples_path_str + 12;
516 +#define QT_CONFIGURE_DEMOS_PATH qt_configure_demos_path_str + 12;
518 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
519 --- qt-win-opensource-src-4.5.0-rc1.orig/src/corelib/global/qconfig.h 1970-01-01 01:00:00.000000000 +0100
520 +++ qt-win-opensource-src-4.5.0-rc1/src/corelib/global/qconfig.h 2009-02-21 11:25:13.000000000 +0000
528 +/* License information */
529 +#define QT_PRODUCT_LICENSEE "Open Source"
530 +#define QT_PRODUCT_LICENSE "OpenSource"
534 +# define QT_EDITION QT_EDITION_OPENSOURCE
537 +#if (defined(_DEBUG) || defined(DEBUG))
538 +# if (defined(WIN64) || defined(_WIN64) || defined(__WIN64__))
539 +# define QT_BUILD_KEY "Windows x64 msvc debug full-config"
541 +# define QT_BUILD_KEY "Windows msvc debug full-config"
544 +# if (defined(WIN64) || defined(_WIN64) || defined(__WIN64__))
545 +# define QT_BUILD_KEY "Windows x64 msvc release full-config"
547 +# define QT_BUILD_KEY "Windows msvc release full-config"
551 +/* Machine byte-order */
552 +#define Q_BIG_ENDIAN 4321
553 +#define Q_LITTLE_ENDIAN 1234
554 +#define Q_BYTE_ORDER Q_LITTLE_ENDIAN
556 +// Compile time features
557 +#define QT_ARCH_WINDOWS
558 +#if defined(QT_GRAPHICSSYSTEM_RASTER) && defined(QT_NO_GRAPHICSSYSTEM_RASTER)
559 +# undef QT_GRAPHICSSYSTEM_RASTER
560 +#elif !defined(QT_GRAPHICSSYSTEM_RASTER)
561 +# define QT_GRAPHICSSYSTEM_RASTER
564 +#if defined(QT_NO_DBUS) && defined(QT_DBUS)
566 +#elif !defined(QT_NO_DBUS)
570 +#if defined(QT_NO_DIRECT3D) && defined(QT_DIRECT3D)
571 +# undef QT_NO_DIRECT3D
572 +#elif !defined(QT_NO_DIRECT3D)
573 +# define QT_NO_DIRECT3D
576 +#if defined(QT_NO_OPENSSL) && defined(QT_OPENSSL)
577 +# undef QT_NO_OPENSSL
578 +#elif !defined(QT_NO_OPENSSL)
579 +# define QT_NO_OPENSSL
582 +#if defined(QT_NO_PHONON) && defined(QT_PHONON)
583 +# undef QT_NO_PHONON
584 +#elif !defined(QT_NO_PHONON)
585 +# define QT_NO_PHONON
588 +#if defined(QT_NO_STYLE_GTK) && defined(QT_STYLE_GTK)
589 +# undef QT_NO_STYLE_GTK
590 +#elif !defined(QT_NO_STYLE_GTK)
591 +# define QT_NO_STYLE_GTK
594 +#if defined(QT_NO_STYLE_WINDOWSCE) && defined(QT_STYLE_WINDOWSCE)
595 +# undef QT_NO_STYLE_WINDOWSCE
596 +#elif !defined(QT_NO_STYLE_WINDOWSCE)
597 +# define QT_NO_STYLE_WINDOWSCE
600 +#if defined(QT_NO_STYLE_WINDOWSMOBILE) && defined(QT_STYLE_WINDOWSMOBILE)
601 +# undef QT_NO_STYLE_WINDOWSMOBILE
602 +#elif !defined(QT_NO_STYLE_WINDOWSMOBILE)
603 +# define QT_NO_STYLE_WINDOWSMOBILE
606 +#if defined(QT_NO_STYLE_WINDOWSVISTA) && defined(QT_STYLE_WINDOWSVISTA)
607 +# undef QT_NO_STYLE_WINDOWSVISTA
608 +#elif !defined(QT_NO_STYLE_WINDOWSVISTA)
609 +# define QT_NO_STYLE_WINDOWSVISTA
612 +#if defined(QT_NO_STYLE_WINDOWSXP) && defined(QT_STYLE_WINDOWSXP)
613 +# undef QT_NO_STYLE_WINDOWSXP
614 +#elif !defined(QT_NO_STYLE_WINDOWSXP)
615 +# define QT_NO_STYLE_WINDOWSXP
618 +#if defined(QT_NO_WEBKIT) && defined(QT_WEBKIT)
619 +# undef QT_NO_WEBKIT
620 +#elif !defined(QT_NO_WEBKIT)
621 +# define QT_NO_WEBKIT