rpms/mingw32-qt/devel qt-win-configure.patch,1.9,1.10
epienbro
epienbro at fedoraproject.org
Sun Jun 27 12:44:49 UTC 2010
Author: epienbro
Update of /cvs/pkgs/rpms/mingw32-qt/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv21994
Modified Files:
qt-win-configure.patch
Log Message:
Forgot to update a patch
qt-win-configure.patch:
.qmake.cache | 20 +++++
configure.cache | 32 ++++++++
configure.output | 146 ++++++++++++++++++++++++++++++++++++
include/Qt/qconfig.h | 1
include/QtCore/qconfig.h | 1
mkspecs/default/qmake.conf | 113 ++++++++++++++++++++++++++++
mkspecs/default/qplatformdefs.h | 160 ++++++++++++++++++++++++++++++++++++++++
mkspecs/qconfig.pri | 12 +++
src/corelib/global/qconfig.cpp | 31 +++++++
src/corelib/global/qconfig.h | 108 +++++++++++++++++++++++++++
10 files changed, 624 insertions(+)
Index: qt-win-configure.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-qt/devel/qt-win-configure.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- qt-win-configure.patch 26 Feb 2010 02:33:53 -0000 1.9
+++ qt-win-configure.patch 27 Jun 2010 12:44:49 -0000 1.10
@@ -1,31 +1,7 @@
-diff -urN qt-everywhere-opensource-src-4.6.2.orig/.qmake.cache qt-everywhere-opensource-src-4.6.2/.qmake.cache
---- qt-everywhere-opensource-src-4.6.2.orig/.qmake.cache 1970-01-01 01:00:00.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.2/.qmake.cache 2010-02-26 03:30:58.000000000 +0100
-@@ -0,0 +1,20 @@
-+QMAKE_QT_VERSION_OVERRIDE = 4
-+OBJECTS_DIR = tmp\obj\release_shared
-+MOC_DIR = tmp\moc\release_shared
-+RCC_DIR = tmp\rcc\release_shared
-+sql-plugins += sqlite
-+styles += windows plastique cleanlooks motif cde
-+imageformat-plugins += gif tiff jpeg
-+CONFIG += minimal-config small-config medium-config large-config full-config release incremental create_prl link_prl depend_includepath QTDIR_build
-+QT_BUILD_PARTS = libs tools examples demos docs translations
-+QMAKESPEC = Z:\mnt\xbox\home\sailer\src\fedora-extras\rpms\mingw32-qt\devel\qt-everywhere-opensource-src-4.6.2\mkspecs\win32-fedora-cross
-+ARCH = windows
-+QT_BUILD_TREE = Z:\mnt\xbox\home\sailer\src\fedora-extras\rpms\mingw32-qt\devel\qt-everywhere-opensource-src-4.6.2
-+QT_SOURCE_TREE = Z:\mnt\xbox\home\sailer\src\fedora-extras\rpms\mingw32-qt\devel\qt-everywhere-opensource-src-4.6.2
-+QMAKE_MOC = $$QT_BUILD_TREE\bin\moc.exe
-+QMAKE_UIC = $$QT_BUILD_TREE\bin\uic.exe
-+QMAKE_UIC3 = $$QT_BUILD_TREE\bin\uic3.exe
-+QMAKE_RCC = $$QT_BUILD_TREE\bin\rcc.exe
-+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-everywhere-opensource-src-4.6.2.orig/configure.cache qt-everywhere-opensource-src-4.6.2/configure.cache
--- qt-everywhere-opensource-src-4.6.2.orig/configure.cache 1970-01-01 01:00:00.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.2/configure.cache 2010-02-26 03:30:58.000000000 +0100
-@@ -0,0 +1,30 @@
++++ qt-everywhere-opensource-src-4.6.2/configure.cache 2010-06-27 14:37:50.868293498 +0200
+@@ -0,0 +1,32 @@
+-platform
+win32-fedora-cross
+-confirm-license
@@ -55,11 +31,21 @@ diff -urN qt-everywhere-opensource-src-4
+-no-sse
+-no-sse2
+-release
++-qt-style-windowsxp
++-qt-style-windowsvista
+-shared
diff -urN qt-everywhere-opensource-src-4.6.2.orig/configure.output qt-everywhere-opensource-src-4.6.2/configure.output
--- qt-everywhere-opensource-src-4.6.2.orig/configure.output 1970-01-01 01:00:00.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.2/configure.output 2010-02-26 03:30:58.000000000 +0100
-@@ -0,0 +1,145 @@
++++ qt-everywhere-opensource-src-4.6.2/configure.output 2010-06-27 14:37:51.019303842 +0200
+@@ -0,0 +1,146 @@
++wine: cannot find L"C:\\windows\\system32\\bcc32.exe"
++wine: cannot find L"C:\\windows\\system32\\mingw32-gcc.exe"
++wine: cannot find L"C:\\windows\\system32\\icl.exe"
++wine: cannot find L"C:\\windows\\system32\\cl.exe"
++wine: cannot find L"C:\\windows\\system32\\cl.exe"
++wine: cannot find L"C:\\windows\\system32\\cl.exe"
++wine: cannot find L"C:\\windows\\system32\\cl.exe"
++wine: cannot find L"C:\\windows\\system32\\cl.exe"
+Which edition of Qt do you want to use ?
+Type 'c' if you want to use the Commercial Edition.
+Type 'o' if you want to use the Open Source Edition.
@@ -83,21 +69,14 @@ diff -urN qt-everywhere-opensource-src-4
+ LIB=
+ Unset
+ PATH=
-+ c:\windows\system32
-+ c:\windows
-+ e:\
-+ e:\test
-+ f:\
-+ h:\src\series60\sdk\s60_30\
-+ h:\src\series60\sdk\s60_30\epoc32\tools
-+ c:\EDA\ePD\2.0\common\win32\bin
-+ c:\EDA\ePD\2.0\common\win32\lib
-+ c:\EDA\ePD\2.0\wv\2001.2\win32\bin
-+ c:\EDA\ePD\2.0\sim\2001.2\fusion\win32\bin
++ C:\Program Files\PC Connectivity Solution\
++ C:\windows\system32
++ C:\windows
++ C:\windows\system32\wbem
+You are licensed to use this software under the terms of the GNU GPL version 3.You are licensed to use this software under the terms of the Lesser GNU LGPL version 2.1.
-+See Z:/mnt/xbox/home/sailer/src/fedora-extras/rpms/mingw32-qt/devel/qt-everywhere-opensource-src-4.6.23
++See Z:/home/erik/mingw/mingw32-qt/devel/qt-everywhere-opensource-src-4.6.23
+
-+ or Z:/mnt/xbox/home/sailer/src/fedora-extras/rpms/mingw32-qt/devel/qt-everywhere-opensource-src-4.6.2L
++ or Z:/home/erik/mingw/mingw32-qt/devel/qt-everywhere-opensource-src-4.6.2L
+
+Configuration:
+ minimal-config
@@ -167,8 +146,8 @@ diff -urN qt-everywhere-opensource-src-4
+
+Styles:
+ Windows.................yes
-+ Windows XP..............no
-+ Windows Vista...........no
++ Windows XP..............yes
++ Windows Vista...........yes
+ Plastique...............yes
+ Cleanlooks..............yes
+ Motif...................yes
@@ -188,8 +167,8 @@ diff -urN qt-everywhere-opensource-src-4
+ SQLite2.................no
+ InterBase...............no
+
-+Sources are in..............Z:\mnt\xbox\home\sailer\src\fedora-extras\rpms\mingw32-qt\devel\qt-everywhere-opensource-src-4.6.2
-+Build is done in............Z:\mnt\xbox\home\sailer\src\fedora-extras\rpms\mingw32-qt\devel\qt-everywhere-opensource-src-4.6.2
++Sources are in..............Z:\home\erik\mingw\mingw32-qt\devel\qt-everywhere-opensource-src-4.6.2
++Build is done in............Z:\home\erik\mingw\mingw32-qt\devel\qt-everywhere-opensource-src-4.6.2
+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
@@ -207,17 +186,17 @@ diff -urN qt-everywhere-opensource-src-4
+
diff -urN qt-everywhere-opensource-src-4.6.2.orig/include/Qt/qconfig.h qt-everywhere-opensource-src-4.6.2/include/Qt/qconfig.h
--- qt-everywhere-opensource-src-4.6.2.orig/include/Qt/qconfig.h 1970-01-01 01:00:00.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.2/include/Qt/qconfig.h 2010-02-26 03:30:58.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.2/include/Qt/qconfig.h 2010-06-27 14:37:51.001294881 +0200
@@ -0,0 +1 @@
+#include "../../src/corelib/global/qconfig.h"
diff -urN qt-everywhere-opensource-src-4.6.2.orig/include/QtCore/qconfig.h qt-everywhere-opensource-src-4.6.2/include/QtCore/qconfig.h
--- qt-everywhere-opensource-src-4.6.2.orig/include/QtCore/qconfig.h 1970-01-01 01:00:00.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.2/include/QtCore/qconfig.h 2010-02-26 03:30:58.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.2/include/QtCore/qconfig.h 2010-06-27 14:37:50.998068342 +0200
@@ -0,0 +1 @@
+#include "../../src/corelib/global/qconfig.h"
diff -urN qt-everywhere-opensource-src-4.6.2.orig/mkspecs/default/qmake.conf qt-everywhere-opensource-src-4.6.2/mkspecs/default/qmake.conf
--- qt-everywhere-opensource-src-4.6.2.orig/mkspecs/default/qmake.conf 1970-01-01 01:00:00.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.2/mkspecs/default/qmake.conf 2010-02-26 03:30:58.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.2/mkspecs/default/qmake.conf 2010-06-27 14:37:51.011294838 +0200
@@ -0,0 +1,113 @@
+#
+# qmake configuration for fedora-win32-cross
@@ -331,10 +310,10 @@ diff -urN qt-everywhere-opensource-src-4
+QMAKE_STRIPFLAGS_LIB += --strip-unneeded
+load(qt_config)
+
-+QMAKESPEC_ORIGINAL=Z:/mnt/xbox/home/sailer/src/fedora-extras/rpms/mingw32-qt/devel/qt-everywhere-opensource-src-4.6.2/mkspecs/win32-fedora-cross
++QMAKESPEC_ORIGINAL=Z:/home/erik/mingw/mingw32-qt/devel/qt-everywhere-opensource-src-4.6.2/mkspecs/win32-fedora-cross
diff -urN qt-everywhere-opensource-src-4.6.2.orig/mkspecs/default/qplatformdefs.h qt-everywhere-opensource-src-4.6.2/mkspecs/default/qplatformdefs.h
--- qt-everywhere-opensource-src-4.6.2.orig/mkspecs/default/qplatformdefs.h 1970-01-01 01:00:00.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.2/mkspecs/default/qplatformdefs.h 2010-02-26 03:30:52.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.2/mkspecs/default/qplatformdefs.h 2010-06-27 14:37:37.864050000 +0200
@@ -0,0 +1,160 @@
+/****************************************************************************
+**
@@ -498,7 +477,7 @@ diff -urN qt-everywhere-opensource-src-4
+#endif // QPLATFORMDEFS_H
diff -urN qt-everywhere-opensource-src-4.6.2.orig/mkspecs/qconfig.pri qt-everywhere-opensource-src-4.6.2/mkspecs/qconfig.pri
--- qt-everywhere-opensource-src-4.6.2.orig/mkspecs/qconfig.pri 1970-01-01 01:00:00.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.2/mkspecs/qconfig.pri 2010-02-26 03:30:58.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.2/mkspecs/qconfig.pri 2010-06-27 14:37:50.872293775 +0200
@@ -0,0 +1,12 @@
+CONFIG+= release shared stl exceptions rtti def_files
+QT_ARCH = windows
@@ -512,16 +491,40 @@ diff -urN qt-everywhere-opensource-src-4
+#Qt for Windows CE c-runtime deployment
+QT_CE_C_RUNTIME = no
+#Qt for Symbian FPU settings
+diff -urN qt-everywhere-opensource-src-4.6.2.orig/.qmake.cache qt-everywhere-opensource-src-4.6.2/.qmake.cache
+--- qt-everywhere-opensource-src-4.6.2.orig/.qmake.cache 1970-01-01 01:00:00.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.2/.qmake.cache 2010-06-27 14:37:50.871309192 +0200
+@@ -0,0 +1,20 @@
++QMAKE_QT_VERSION_OVERRIDE = 4
++OBJECTS_DIR = tmp\obj\release_shared
++MOC_DIR = tmp\moc\release_shared
++RCC_DIR = tmp\rcc\release_shared
++sql-plugins += sqlite
++styles += windows plastique cleanlooks windowsxp windowsvista motif cde
++imageformat-plugins += gif tiff jpeg
++CONFIG += minimal-config small-config medium-config large-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\erik\mingw\mingw32-qt\devel\qt-everywhere-opensource-src-4.6.2\mkspecs\win32-fedora-cross
++ARCH = windows
++QT_BUILD_TREE = Z:\home\erik\mingw\mingw32-qt\devel\qt-everywhere-opensource-src-4.6.2
++QT_SOURCE_TREE = Z:\home\erik\mingw\mingw32-qt\devel\qt-everywhere-opensource-src-4.6.2
++QMAKE_MOC = $$QT_BUILD_TREE\bin\moc.exe
++QMAKE_UIC = $$QT_BUILD_TREE\bin\uic.exe
++QMAKE_UIC3 = $$QT_BUILD_TREE\bin\uic3.exe
++QMAKE_RCC = $$QT_BUILD_TREE\bin\rcc.exe
++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-everywhere-opensource-src-4.6.2.orig/src/corelib/global/qconfig.cpp qt-everywhere-opensource-src-4.6.2/src/corelib/global/qconfig.cpp
--- qt-everywhere-opensource-src-4.6.2.orig/src/corelib/global/qconfig.cpp 1970-01-01 01:00:00.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.2/src/corelib/global/qconfig.cpp 2010-02-26 03:30:58.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.2/src/corelib/global/qconfig.cpp 2010-06-27 14:37:51.014303000 +0200
@@ -0,0 +1,31 @@
+/* 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";
+
+/* Build date */
-+static const char qt_configure_installation [11 + 12] = "qt_instdate=2010-02-26";
++static const char qt_configure_installation [11 + 12] = "qt_instdate=2010-06-27";
+
+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";
@@ -549,8 +552,8 @@ diff -urN qt-everywhere-opensource-src-4
+
diff -urN qt-everywhere-opensource-src-4.6.2.orig/src/corelib/global/qconfig.h qt-everywhere-opensource-src-4.6.2/src/corelib/global/qconfig.h
--- qt-everywhere-opensource-src-4.6.2.orig/src/corelib/global/qconfig.h 1970-01-01 01:00:00.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.2/src/corelib/global/qconfig.h 2010-02-26 03:30:58.000000000 +0100
-@@ -0,0 +1,120 @@
++++ qt-everywhere-opensource-src-4.6.2/src/corelib/global/qconfig.h 2010-06-27 14:37:50.990297000 +0200
+@@ -0,0 +1,108 @@
+/* Everything */
+
+#ifndef QT_DLL
@@ -653,18 +656,6 @@ diff -urN qt-everywhere-opensource-src-4
+# 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)
More information about the scm-commits
mailing list