1 diff -urN qt-win-opensource-src-4.4.3.orig/configure.cache qt-win-opensource-src-4.4.3/configure.cache
2 --- qt-win-opensource-src-4.4.3.orig/configure.cache 1970-01-01 01:00:00.000000000 +0100
3 +++ qt-win-opensource-src-4.4.3/configure.cache 2009-02-02 14:39:05.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.4.3.orig/configure.output qt-win-opensource-src-4.4.3/configure.output
36 --- qt-win-opensource-src-4.4.3.orig/configure.output 1970-01-01 01:00:00.000000000 +0100
37 +++ qt-win-opensource-src-4.4.3/configure.output 2009-02-02 14:39:05.000000000 +0000
39 +Xlib: extension "Generic Event Extension" missing on display "localhost:10.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.4.3/LICENSE.GPL2
\r
64 + or Z:/home/rjones/d/fedora-mingw--devel/qt-win/qt-win-opensource-src-4.4.3/LICENSE.GPL3
\r
90 +QMAKESPEC...................fedora-win32-cross (commandline)
\r
91 +Architecture................windows
\r
92 +Maketool....................make
\r
93 +Debug symbols...............no
\r
94 +Accessibility support.......yes
\r
95 +STL support.................yes
\r
96 +Exception support...........yes
\r
97 +RTTI support................yes
\r
98 +MMX support.................no
\r
99 +3DNOW support...............no
\r
100 +SSE support.................no
\r
101 +SSE2 support................no
\r
102 +IWMMXT support..............no
\r
103 +OpenGL support..............yes
\r
104 +Direct3D support............no
\r
105 +OpenSSL support.............no
\r
106 +QtDBus support..............no
\r
107 +QtXmlPatterns support.......yes
\r
108 +Phonon support..............no
\r
109 +WebKit support..............no
\r
110 +Qt3 compatibility...........yes
\r
112 +Third Party Libraries:
\r
113 + ZLIB support............qt
\r
114 + GIF support.............plugin
\r
115 + TIFF support............plugin
\r
116 + JPEG support............plugin
\r
117 + PNG support.............qt
\r
118 + MNG support.............plugin
\r
121 + Windows.................yes
\r
122 + Windows XP..............no
\r
123 + Windows Vista...........no
\r
124 + Plastique...............yes
\r
125 + Cleanlooks..............yes
\r
126 + Motif...................yes
\r
127 + CDE.....................yes
\r
128 + Windows CE..............no
\r
129 + Windows Mobile..........no
\r
132 + ODBC....................no
\r
133 + MySQL...................no
\r
134 + OCI.....................no
\r
135 + PostgreSQL..............no
\r
136 + TDS.....................no
\r
137 + DB2.....................no
\r
138 + SQLite..................plugin (qt)
\r
139 + SQLite2.................no
\r
140 + InterBase...............no
\r
142 +Sources are in..............Z:\home\rjones\d\fedora-mingw--devel\qt-win\qt-win-opensource-src-4.4.3
\r
143 +Build is done in............Z:\home\rjones\d\fedora-mingw--devel\qt-win\qt-win-opensource-src-4.4.3
\r
144 +Install prefix............../usr/i686-pc-mingw32/sys-root/mingw
\r
145 +Headers installed to......../usr/i686-pc-mingw32/sys-root/mingw/include
\r
146 +Libraries installed to....../usr/i686-pc-mingw32/sys-root/mingw/lib
\r
147 +Plugins installed to......../usr/i686-pc-mingw32/sys-root/mingw/lib/qt4/plugins
\r
148 +Binaries installed to......./usr/i686-pc-mingw32/sys-root/mingw/bin
\r
149 +Docs installed to.........../usr/i686-pc-mingw32/sys-root/mingw/share/doc
\r
150 +Data installed to.........../usr/i686-pc-mingw32/sys-root/mingw/share
\r
151 +Translations installed to.../usr/i686-pc-mingw32/sys-root/mingw/share/qt4/translations
\r
152 +Examples installed to......./usr/i686-pc-mingw32/sys-root/mingw/share/qt4/examples
\r
153 +Demos installed to........../usr/i686-pc-mingw32/sys-root/mingw/lib/qt4/demos
\r
155 +Processing of project files have been disabled.
\r
156 +Only use this option if you really know what you're doing.
\r
158 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
159 --- qt-win-opensource-src-4.4.3.orig/include/Qt/qconfig.h 1970-01-01 01:00:00.000000000 +0100
160 +++ qt-win-opensource-src-4.4.3/include/Qt/qconfig.h 2009-02-02 14:39:05.000000000 +0000
162 +#include "../../src/corelib/global/qconfig.h"
163 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
164 --- qt-win-opensource-src-4.4.3.orig/include/QtCore/qconfig.h 1970-01-01 01:00:00.000000000 +0100
165 +++ qt-win-opensource-src-4.4.3/include/QtCore/qconfig.h 2009-02-02 14:39:05.000000000 +0000
167 +#include "../../src/corelib/global/qconfig.h"
168 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
169 --- qt-win-opensource-src-4.4.3.orig/mkspecs/default/qmake.conf 1970-01-01 01:00:00.000000000 +0100
170 +++ qt-win-opensource-src-4.4.3/mkspecs/default/qmake.conf 2009-02-02 14:39:05.000000000 +0000
173 +# qmake configuration for fedora-win32-cross
\r
174 +# (Fedora Windows cross-compiler)
\r
175 +# by Richard W.M. Jones (rjones@redhat.com)
\r
177 +# Written for MinGW
\r
180 +MAKEFILE_GENERATOR = MINGW
\r
182 +CONFIG += qt warn_on release link_prl copy_dir_files debug_and_release debug_and_release_target precompile_header
\r
184 +DEFINES += UNICODE QT_LARGEFILE_SUPPORT
\r
185 +QMAKE_COMPILER_DEFINES += __GNUC__ WIN32
\r
187 +QMAKE_EXT_OBJ = .o
\r
188 +QMAKE_EXT_RES = _res.o
\r
190 +QMAKE_CC = i686-pc-mingw32-gcc
\r
193 +QMAKE_YACC = byacc
\r
194 +QMAKE_YACCFLAGS = -d
\r
195 +QMAKE_CFLAGS = -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 --param=ssp-buffer-size=4 -mms-bitfields
\r
196 +QMAKE_CFLAGS_DEPS = -M
\r
197 +QMAKE_CFLAGS_WARN_ON = -Wall
\r
198 +QMAKE_CFLAGS_WARN_OFF = -w
\r
199 +QMAKE_CFLAGS_RELEASE = -O2
\r
200 +QMAKE_CFLAGS_DEBUG = -g
\r
201 +QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses
\r
203 +QMAKE_CXX = i686-pc-mingw32-g++
\r
204 +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS
\r
205 +QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS
\r
206 +QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
\r
207 +QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
\r
208 +QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE
\r
209 +QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG
\r
210 +QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC
\r
211 +QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD
\r
212 +QMAKE_CXXFLAGS_RTTI_ON = -frtti
\r
213 +QMAKE_CXXFLAGS_RTTI_OFF = -fno-rtti
\r
214 +QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions -mthreads
\r
215 +QMAKE_CXXFLAGS_EXCEPTIONS_OFF = -fno-exceptions
\r
218 +#QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS]
\r
219 +QMAKE_INCDIR_QT = /usr/i686-pc-mingw32/sys-root/mingw/include
\r
220 +#QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS]
\r
221 +QMAKE_LIBDIR_QT = /usr/i686-pc-mingw32/sys-root/mingw/lib
\r
223 +QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -o $obj $src
\r
224 +QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
\r
225 +QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src
\r
226 +QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
\r
228 +QMAKE_LINK = i686-pc-mingw32-g++
\r
229 +QMAKE_LFLAGS = -enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc
\r
230 +QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads -Wl
\r
231 +QMAKE_LFLAGS_EXCEPTIONS_OFF =
\r
232 +QMAKE_LFLAGS_RELEASE = -Wl,-s
\r
233 +QMAKE_LFLAGS_DEBUG =
\r
234 +QMAKE_LFLAGS_CONSOLE = -Wl,-subsystem,console
\r
235 +QMAKE_LFLAGS_WINDOWS = -Wl,-subsystem,windows
\r
236 +QMAKE_LFLAGS_DLL = -shared
\r
237 +QMAKE_LINK_OBJECT_MAX = 10
\r
238 +QMAKE_LINK_OBJECT_SCRIPT= object_script
\r
242 +QMAKE_LIBS_CORE = -lkernel32 -luser32 -lshell32 -luuid -lole32 -ladvapi32 -lws2_32
\r
243 +QMAKE_LIBS_GUI = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lwinspool -lws2_32 -lole32 -luuid -luser32 -ladvapi32
\r
244 +QMAKE_LIBS_NETWORK = -lws2_32
\r
245 +QMAKE_LIBS_OPENGL = -lopengl32 -lglu32 -lgdi32 -luser32
\r
246 +QMAKE_LIBS_COMPAT = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32
\r
247 +QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain
\r
250 +QMAKE_COPY = cp -f
\r
251 +QMAKE_COPY_FILE = $(COPY)
\r
252 +QMAKE_COPY_DIR = $(COPY) -a
\r
253 +QMAKE_MOVE = mv -f
\r
254 +QMAKE_DEL_FILE = rm -f
\r
255 +QMAKE_DEL_DIR = rmdir
\r
256 +QMAKE_STRIP = strip
\r
257 +QMAKE_STRIPFLAGS_LIB += --strip-unneeded
\r
258 +QMAKE_INSTALL_FILE = install -m 644 -p
\r
259 +QMAKE_INSTALL_PROGRAM = install -m 755 -p
\r
261 +# "qmake -win32" always appears to generate code like this:
\r
262 +# $(CHK_DIR_EXISTS) somedir $(MKDIR) somedir
\r
263 +# We can't write a Unix macro that is compatible, so we have to hack it:
\r
264 +QMAKE_CHK_DIR_EXISTS = mkdir -p
\r
267 +QMAKE_MOC = moc-qt4
\r
268 +QMAKE_UIC = uic-qt4
\r
272 +QMAKE_LIB = i686-pc-mingw32-ar -ru
\r
273 +QMAKE_RC = i686-pc-mingw32-windres
\r
274 +QMAKE_ZIP = zip -r -9
\r
276 +QMAKE_STRIP = strip
\r
277 +QMAKE_STRIPFLAGS_LIB += --strip-unneeded
\r
280 +QMAKESPEC_ORIGINAL=Z:/home/rjones/d/fedora-mingw--devel/qt-win/qt-win-opensource-src-4.4.3/mkspecs/fedora-win32-cross
\r
281 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
282 --- qt-win-opensource-src-4.4.3.orig/mkspecs/default/qplatformdefs.h 1970-01-01 01:00:00.000000000 +0100
283 +++ qt-win-opensource-src-4.4.3/mkspecs/default/qplatformdefs.h 2009-02-02 14:39:01.000000000 +0000
285 +/****************************************************************************
\r
287 +** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
\r
288 +** Contact: Qt Software Information (qt-info@nokia.com)
\r
290 +** This file is part of the qmake spec of the Qt Toolkit.
\r
292 +** Commercial Usage
\r
293 +** Licensees holding valid Qt Commercial licenses may use this file in
\r
294 +** accordance with the Qt Commercial License Agreement provided with the
\r
295 +** Software or, alternatively, in accordance with the terms contained in
\r
296 +** a written agreement between you and Nokia.
\r
299 +** GNU General Public License Usage
\r
300 +** Alternatively, this file may be used under the terms of the GNU
\r
301 +** General Public License versions 2.0 or 3.0 as published by the Free
\r
302 +** Software Foundation and appearing in the file LICENSE.GPL included in
\r
303 +** the packaging of this file. Please review the following information
\r
304 +** to ensure GNU General Public Licensing requirements will be met:
\r
305 +** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
\r
306 +** http://www.gnu.org/copyleft/gpl.html. In addition, as a special
\r
307 +** exception, Nokia gives you certain additional rights. These rights
\r
308 +** are described in the Nokia Qt GPL Exception version 1.3, included in
\r
309 +** the file GPL_EXCEPTION.txt in this package.
\r
311 +** Qt for Windows(R) Licensees
\r
312 +** As a special exception, Nokia, as the sole copyright holder for Qt
\r
313 +** Designer, grants users of the Qt/Eclipse Integration plug-in the
\r
314 +** right for the Qt/Eclipse Integration to link to functionality
\r
315 +** provided by Qt Designer and its related libraries.
\r
317 +** If you are unsure which license is appropriate for your use, please
\r
318 +** contact the sales department at qt-sales@nokia.com.
\r
320 +****************************************************************************/
\r
322 +#ifndef QPLATFORMDEFS_H
\r
323 +#define QPLATFORMDEFS_H
\r
331 +// Get Qt defines/settings
\r
333 +#include "qglobal.h"
\r
335 +#include <tchar.h>
\r
337 +#include <direct.h>
\r
338 +#include <stdio.h>
\r
339 +#include <fcntl.h>
\r
340 +#include <errno.h>
\r
341 +#include <sys/stat.h>
\r
342 +#include <stdlib.h>
\r
343 +#include <windows.h>
\r
344 +#include <limits.h>
\r
346 +#if !defined(_WIN32_WINNT) || (_WIN32_WINNT-0 < 0x0500)
\r
348 + NameUnknown = 0,
\r
349 + NameFullyQualifiedDN = 1,
\r
350 + NameSamCompatible = 2,
\r
351 + NameDisplay = 3,
\r
352 + NameUniqueId = 6,
\r
353 + NameCanonical = 7,
\r
354 + NameUserPrincipal = 8,
\r
355 + NameCanonicalEx = 9,
\r
356 + NameServicePrincipal = 10,
\r
357 + NameDnsDomain = 12
\r
358 +} EXTENDED_NAME_FORMAT, *PEXTENDED_NAME_FORMAT;
\r
362 +#ifdef QT_LARGEFILE_SUPPORT
\r
363 +#define QT_STATBUF struct _stati64 // non-ANSI defs
\r
364 +#define QT_STATBUF4TSTAT struct _stati64 // non-ANSI defs
\r
365 +#define QT_STAT ::_stati64
\r
366 +#define QT_FSTAT ::_fstati64
\r
368 +#define QT_STATBUF struct _stat // non-ANSI defs
\r
369 +#define QT_STATBUF4TSTAT struct _stat // non-ANSI defs
\r
370 +#define QT_STAT ::_stat
\r
371 +#define QT_FSTAT ::_fstat
\r
373 +#define QT_STAT_REG _S_IFREG
\r
374 +#define QT_STAT_DIR _S_IFDIR
\r
375 +#define QT_STAT_MASK _S_IFMT
\r
376 +#if defined(_S_IFLNK)
\r
377 +# define QT_STAT_LNK _S_IFLNK
\r
379 +#define QT_FILENO _fileno
\r
380 +#define QT_OPEN ::_open
\r
381 +#define QT_CLOSE ::_close
\r
382 +#ifdef QT_LARGEFILE_SUPPORT
\r
383 +#define QT_LSEEK ::_lseeki64
\r
385 +#define QT_TSTAT ::_stati64
\r
387 +#define QT_TSTAT ::_wstati64
\r
390 +#define QT_LSEEK ::_lseek
\r
392 +#define QT_TSTAT ::_stat
\r
394 +#define QT_TSTAT ::_wstat
\r
397 +#define QT_READ ::_read
\r
398 +#define QT_WRITE ::_write
\r
399 +#define QT_ACCESS ::_access
\r
400 +#define QT_GETCWD ::_getcwd
\r
401 +#define QT_CHDIR ::_chdir
\r
402 +#define QT_MKDIR ::_mkdir
\r
403 +#define QT_RMDIR ::_rmdir
\r
404 +#define QT_OPEN_LARGEFILE 0
\r
405 +#define QT_OPEN_RDONLY _O_RDONLY
\r
406 +#define QT_OPEN_WRONLY _O_WRONLY
\r
407 +#define QT_OPEN_RDWR _O_RDWR
\r
408 +#define QT_OPEN_CREAT _O_CREAT
\r
409 +#define QT_OPEN_TRUNC _O_TRUNC
\r
410 +#define QT_OPEN_APPEND _O_APPEND
\r
411 +#if defined(O_TEXT)
\r
412 +# define QT_OPEN_TEXT _O_TEXT
\r
413 +# define QT_OPEN_BINARY _O_BINARY
\r
416 +#define QT_FOPEN ::fopen
\r
417 +#ifdef QT_LARGEFILE_SUPPORT
\r
418 +#define QT_FSEEK ::fseeko64
\r
419 +#define QT_FTELL ::ftello64
\r
421 +#define QT_FSEEK ::fseek
\r
422 +#define QT_FTELL ::ftell
\r
424 +#define QT_FGETPOS ::fgetpos
\r
425 +#define QT_FSETPOS ::fsetpos
\r
426 +#define QT_FPOS_T fpos_t
\r
427 +#ifdef QT_LARGEFILE_SUPPORT
\r
428 +#define QT_OFF_T off64_t
\r
430 +#define QT_OFF_T long
\r
433 +#define QT_SIGNAL_ARGS int
\r
435 +#define QT_VSNPRINTF ::_vsnprintf
\r
436 +#define QT_SNPRINTF ::_snprintf
\r
444 +#endif // QPLATFORMDEFS_H
\r
445 diff -urN qt-win-opensource-src-4.4.3.orig/mkspecs/qconfig.pri qt-win-opensource-src-4.4.3/mkspecs/qconfig.pri
446 --- qt-win-opensource-src-4.4.3.orig/mkspecs/qconfig.pri 1970-01-01 01:00:00.000000000 +0100
447 +++ qt-win-opensource-src-4.4.3/mkspecs/qconfig.pri 2009-02-02 14:39:05.000000000 +0000
449 +CONFIG+= release shared stl exceptions rtti
\r
451 +QT_EDITION = OpenSource
\r
452 +QT_CONFIG += release zlib png accessibility qt3support opengl ipv6 xmlpatterns svg minimal-config small-config medium-config large-config full-config
\r
454 +QT_VERSION = 4.4.3
\r
455 +QT_MAJOR_VERSION = 4
\r
456 +QT_MINOR_VERSION = 4
\r
457 +QT_PATCH_VERSION = 3
\r
458 +#Qt for Windows CE c-runtime deployment
\r
459 +QT_CE_C_RUNTIME = no
\r
460 diff -urN qt-win-opensource-src-4.4.3.orig/.qmake.cache qt-win-opensource-src-4.4.3/.qmake.cache
461 --- qt-win-opensource-src-4.4.3.orig/.qmake.cache 1970-01-01 01:00:00.000000000 +0100
462 +++ qt-win-opensource-src-4.4.3/.qmake.cache 2009-02-02 14:39:05.000000000 +0000
464 +QMAKE_QT_VERSION_OVERRIDE = 4
\r
465 +OBJECTS_DIR = tmp\obj\release_shared
\r
466 +MOC_DIR = tmp\moc\release_shared
\r
467 +RCC_DIR = tmp\rcc\release_shared
\r
468 +sql-plugins += sqlite
\r
469 +styles += windows plastique cleanlooks motif cde
\r
470 +imageformat-plugins += gif tiff jpeg
\r
471 +CONFIG += dist-config large-config medium-config minimal-config small-config full-config release incremental create_prl link_prl depend_includepath QTDIR_build
\r
472 +QT_BUILD_PARTS = libs tools examples demos docs translations
\r
473 +QMAKESPEC = Z:\home\rjones\d\fedora-mingw--devel\qt-win\qt-win-opensource-src-4.4.3\mkspecs\fedora-win32-cross
\r
475 +QT_BUILD_TREE = Z:\home\rjones\d\fedora-mingw--devel\qt-win\qt-win-opensource-src-4.4.3
\r
476 +QT_SOURCE_TREE = Z:\home\rjones\d\fedora-mingw--devel\qt-win\qt-win-opensource-src-4.4.3
\r
477 +QMAKE_MOC = $$QT_BUILD_TREE\bin\moc.exe
\r
478 +QMAKE_UIC = $$QT_BUILD_TREE\bin\uic.exe
\r
479 +QMAKE_UIC3 = $$QT_BUILD_TREE\bin\uic3.exe
\r
480 +QMAKE_RCC = $$QT_BUILD_TREE\bin\rcc.exe
\r
481 +QMAKE_DUMPCPP = $$QT_BUILD_TREE\bin\dumpcpp.exe
\r
482 +QMAKE_INCDIR_QT = $$QT_BUILD_TREE\include
\r
483 +QMAKE_LIBDIR_QT = $$QT_BUILD_TREE\lib
\r
484 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
485 --- qt-win-opensource-src-4.4.3.orig/src/corelib/global/qconfig.cpp 1970-01-01 01:00:00.000000000 +0100
486 +++ qt-win-opensource-src-4.4.3/src/corelib/global/qconfig.cpp 2009-02-02 14:39:05.000000000 +0000
489 +static const char qt_configure_licensee_str [512 + 12] = "qt_lcnsuser=Open Source";
490 +static const char qt_configure_licensed_products_str [512 + 12] = "qt_lcnsprod=OpenSource";
491 +static const char qt_configure_prefix_path_str [512 + 12] = "qt_prfxpath=/usr/i686-pc-mingw32/sys-root/mingw";
492 +static const char qt_configure_documentation_path_str[512 + 12] = "qt_docspath=/usr/i686-pc-mingw32/sys-root/mingw/share/doc";
493 +static const char qt_configure_headers_path_str [512 + 12] = "qt_hdrspath=/usr/i686-pc-mingw32/sys-root/mingw/include";
494 +static const char qt_configure_libraries_path_str [512 + 12] = "qt_libspath=/usr/i686-pc-mingw32/sys-root/mingw/lib";
495 +static const char qt_configure_binaries_path_str [512 + 12] = "qt_binspath=/usr/i686-pc-mingw32/sys-root/mingw/bin";
496 +static const char qt_configure_plugins_path_str [512 + 12] = "qt_plugpath=/usr/i686-pc-mingw32/sys-root/mingw/lib/qt4/plugins";
497 +static const char qt_configure_data_path_str [512 + 12] = "qt_datapath=/usr/i686-pc-mingw32/sys-root/mingw/share";
498 +static const char qt_configure_translations_path_str [512 + 12] = "qt_trnspath=/usr/i686-pc-mingw32/sys-root/mingw/share/qt4/translations";
499 +static const char qt_configure_examples_path_str [512 + 12] = "qt_xmplpath=/usr/i686-pc-mingw32/sys-root/mingw/share/qt4/examples";
500 +static const char qt_configure_demos_path_str [512 + 12] = "qt_demopath=/usr/i686-pc-mingw32/sys-root/mingw/lib/qt4/demos";
501 +/* strlen( "qt_lcnsxxxx" ) == 12 */
502 +#define QT_CONFIGURE_LICENSEE qt_configure_licensee_str + 12;
503 +#define QT_CONFIGURE_LICENSED_PRODUCTS qt_configure_licensed_products_str + 12;
504 +#define QT_CONFIGURE_PREFIX_PATH qt_configure_prefix_path_str + 12;
505 +#define QT_CONFIGURE_DOCUMENTATION_PATH qt_configure_documentation_path_str + 12;
506 +#define QT_CONFIGURE_HEADERS_PATH qt_configure_headers_path_str + 12;
507 +#define QT_CONFIGURE_LIBRARIES_PATH qt_configure_libraries_path_str + 12;
508 +#define QT_CONFIGURE_BINARIES_PATH qt_configure_binaries_path_str + 12;
509 +#define QT_CONFIGURE_PLUGINS_PATH qt_configure_plugins_path_str + 12;
510 +#define QT_CONFIGURE_DATA_PATH qt_configure_data_path_str + 12;
511 +#define QT_CONFIGURE_TRANSLATIONS_PATH qt_configure_translations_path_str + 12;
512 +#define QT_CONFIGURE_EXAMPLES_PATH qt_configure_examples_path_str + 12;
513 +#define QT_CONFIGURE_DEMOS_PATH qt_configure_demos_path_str + 12;
515 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
516 --- qt-win-opensource-src-4.4.3.orig/src/corelib/global/qconfig.h 1970-01-01 01:00:00.000000000 +0100
517 +++ qt-win-opensource-src-4.4.3/src/corelib/global/qconfig.h 2009-02-02 14:39:05.000000000 +0000
525 +/* License information */
526 +#define QT_PRODUCT_LICENSEE "Open Source"
527 +#define QT_PRODUCT_LICENSE "OpenSource"
531 +# define QT_EDITION QT_EDITION_OPENSOURCE
534 +#if (defined(_DEBUG) || defined(DEBUG))
535 +# if (defined(WIN64) || defined(_WIN64) || defined(__WIN64__))
536 +# define QT_BUILD_KEY "Windows x64 msvc debug full-config"
538 +# define QT_BUILD_KEY "Windows msvc debug full-config"
541 +# if (defined(WIN64) || defined(_WIN64) || defined(__WIN64__))
542 +# define QT_BUILD_KEY "Windows x64 msvc release full-config"
544 +# define QT_BUILD_KEY "Windows msvc release full-config"
548 +/* Machine byte-order */
549 +#define Q_BIG_ENDIAN 4321
550 +#define Q_LITTLE_ENDIAN 1234
551 +#define Q_BYTE_ORDER Q_LITTLE_ENDIAN
553 +// Compile time features
554 +#define QT_ARCH_WINDOWS
555 +#if defined(QT_NO_DBUS) && defined(QT_DBUS)
557 +#elif !defined(QT_NO_DBUS)
561 +#if defined(QT_NO_DIRECT3D) && defined(QT_DIRECT3D)
562 +# undef QT_NO_DIRECT3D
563 +#elif !defined(QT_NO_DIRECT3D)
564 +# define QT_NO_DIRECT3D
567 +#if defined(QT_NO_OPENSSL) && defined(QT_OPENSSL)
568 +# undef QT_NO_OPENSSL
569 +#elif !defined(QT_NO_OPENSSL)
570 +# define QT_NO_OPENSSL
573 +#if defined(QT_NO_PHONON) && defined(QT_PHONON)
574 +# undef QT_NO_PHONON
575 +#elif !defined(QT_NO_PHONON)
576 +# define QT_NO_PHONON
579 +#if defined(QT_NO_STYLE_WINDOWSCE) && defined(QT_STYLE_WINDOWSCE)
580 +# undef QT_NO_STYLE_WINDOWSCE
581 +#elif !defined(QT_NO_STYLE_WINDOWSCE)
582 +# define QT_NO_STYLE_WINDOWSCE
585 +#if defined(QT_NO_STYLE_WINDOWSMOBILE) && defined(QT_STYLE_WINDOWSMOBILE)
586 +# undef QT_NO_STYLE_WINDOWSMOBILE
587 +#elif !defined(QT_NO_STYLE_WINDOWSMOBILE)
588 +# define QT_NO_STYLE_WINDOWSMOBILE
591 +#if defined(QT_NO_STYLE_WINDOWSVISTA) && defined(QT_STYLE_WINDOWSVISTA)
592 +# undef QT_NO_STYLE_WINDOWSVISTA
593 +#elif !defined(QT_NO_STYLE_WINDOWSVISTA)
594 +# define QT_NO_STYLE_WINDOWSVISTA
597 +#if defined(QT_NO_STYLE_WINDOWSXP) && defined(QT_STYLE_WINDOWSXP)
598 +# undef QT_NO_STYLE_WINDOWSXP
599 +#elif !defined(QT_NO_STYLE_WINDOWSXP)
600 +# define QT_NO_STYLE_WINDOWSXP
603 +#if defined(QT_NO_WEBKIT) && defined(QT_WEBKIT)
604 +# undef QT_NO_WEBKIT
605 +#elif !defined(QT_NO_WEBKIT)
606 +# define QT_NO_WEBKIT