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 4786e55..4810e68 100644 --- a/patches/0001-Some-changes-for-qtbase.patch +++ b/patches/0001-Some-changes-for-qtbase.patch @@ -1,4 +1,4 @@ -From f9c8d4dc3ee116478480ec6ceb023bb482255c46 Mon Sep 17 00:00:00 2001 +From 01ec70f4e071494e1ee9337295b604cda5b02d6c 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 @@ -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 99b79fc..5238c34 100755 +index 96895ed..8c2c185 100755 --- a/qtbase/configure +++ b/qtbase/configure -@@ -8769,11 +8769,11 @@ EXEC="" +@@ -8821,11 +8821,11 @@ EXEC="" echo "Finding project files. Please wait..." if [ "$CFG_NOPROCESS" != "yes" ]; then @@ -327,10 +327,10 @@ index 4736d09..ca42da6 100644 debug-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_DEBUG_TARGETS debug-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) debug) diff --git a/qtbase/tools/configure/configureapp.cpp b/qtbase/tools/configure/configureapp.cpp -index ab19a04..b74d610 100644 +index 494ea52..c6819db 100644 --- a/qtbase/tools/configure/configureapp.cpp +++ b/qtbase/tools/configure/configureapp.cpp -@@ -3858,7 +3858,7 @@ void Configure::generateMakefiles() +@@ -3856,7 +3856,7 @@ void Configure::generateMakefiles() } // don't pass -spec - .qmake.cache has it already args << "-r"; @@ -340,5 +340,5 @@ index ab19a04..b74d610 100644 args << buildPath; if (!dictionary[ "QMAKEADDITIONALARGS" ].isEmpty()) -- -1.7.3.2.343.g7d43d +1.7.5.rc2.4.g4d8b3 |