diff options
Diffstat (limited to 'patches/0001-Some-changes-for-qtbase.patch')
| -rw-r--r-- | patches/0001-Some-changes-for-qtbase.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/patches/0001-Some-changes-for-qtbase.patch b/patches/0001-Some-changes-for-qtbase.patch index 4810e68..f16fa52 100644 --- a/patches/0001-Some-changes-for-qtbase.patch +++ b/patches/0001-Some-changes-for-qtbase.patch @@ -1,4 +1,4 @@ -From 01ec70f4e071494e1ee9337295b604cda5b02d6c Mon Sep 17 00:00:00 2001 +From 79eefa102ad34748ef9765b4c563412f0ff95d3a Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Date: Mon, 8 Nov 2010 20:09:10 -0600 Subject: [PATCH] Some changes for qtbase @@ -15,7 +15,7 @@ Subject: [PATCH] Some changes for qtbase 8 files changed, 11 insertions(+), 131 deletions(-) diff --git a/qtbase/bin/syncqt b/qtbase/bin/syncqt -index 32b5384..9d5eece 100755 +index b25a432..451521c 100755 --- a/qtbase/bin/syncqt +++ b/qtbase/bin/syncqt @@ -34,28 +34,13 @@ my %modules = ( # path to module name map @@ -47,7 +47,7 @@ index 32b5384..9d5eece 100755 ); #$modules{"QtCore"} .= ";$basedir/mkspecs/" . $ENV{"MKSPEC"} if defined $ENV{"MKSPEC"}; -@@ -692,7 +677,7 @@ my @ignore_for_master_contents = ( "qt.h", "qpaintdevicedefs.h" ); +@@ -694,7 +679,7 @@ my @ignore_for_master_contents = ( "qt.h", "qpaintdevicedefs.h" ); my @ignore_for_include_check = ( "qatomic.h" ); my @ignore_for_qt_begin_header_check = ( "qiconset.h", "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qt_windows.h" ); my @ignore_for_qt_begin_namespace_check = ( "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qatomic_arch.h", "qatomic_windowsce.h", "qt_windows.h", "qatomic_macosx.h", "qatomic_arm.h", "qatomic_armv7.h" ); @@ -57,10 +57,10 @@ index 32b5384..9d5eece 100755 my %inject_headers = ( "$basedir/src/corelib/global" => ( "qconfig.h" ) ); # all from build dir diff --git a/qtbase/configure b/qtbase/configure -index 96895ed..8c2c185 100755 +index 976267e..5e3e40f 100755 --- a/qtbase/configure +++ b/qtbase/configure -@@ -8821,11 +8821,11 @@ EXEC="" +@@ -8820,11 +8820,11 @@ EXEC="" echo "Finding project files. Please wait..." if [ "$CFG_NOPROCESS" != "yes" ]; then @@ -340,5 +340,5 @@ index 494ea52..c6819db 100644 args << buildPath; if (!dictionary[ "QMAKEADDITIONALARGS" ].isEmpty()) -- -1.7.5.rc2.4.g4d8b3 +1.7.3.4 |