diff options
| author | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2011-04-12 15:02:41 -0500 |
|---|---|---|
| committer | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2011-04-12 15:51:27 -0500 |
| commit | b3f26c5debfa5f38972aea4fce3ba11d509436d2 (patch) | |
| tree | 9f6cae234c280e9151538a8cd763dcec492969ff /patches/0049-Remove-hardcoded-modules-in-configure-and-QT_CONFIG.patch | |
| parent | 5dc1a8bbc0eaaa2bb1d23e6f459df3f63c4bf19f (diff) | |
Rebase ontop of current master
Diffstat (limited to 'patches/0049-Remove-hardcoded-modules-in-configure-and-QT_CONFIG.patch')
| -rw-r--r-- | patches/0049-Remove-hardcoded-modules-in-configure-and-QT_CONFIG.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/0049-Remove-hardcoded-modules-in-configure-and-QT_CONFIG.patch b/patches/0049-Remove-hardcoded-modules-in-configure-and-QT_CONFIG.patch index be7c785..50a97e6 100644 --- a/patches/0049-Remove-hardcoded-modules-in-configure-and-QT_CONFIG.patch +++ b/patches/0049-Remove-hardcoded-modules-in-configure-and-QT_CONFIG.patch @@ -1,4 +1,4 @@ -From a288366d6b53715ae16c71030300ea3476a7285b Mon Sep 17 00:00:00 2001 +From 9395e18728811d9dbbd03f12cbbe97c00d9cfe1b Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Date: Mon, 21 Mar 2011 10:02:39 -0500 Subject: [PATCH] Remove hardcoded modules in configure and QT_CONFIG @@ -8,11 +8,11 @@ Also, turning on/off qt3support-functions in core. - Fix QT_BUILD_PARTS for configure.exe --- - qtbase/tools/configure/configureapp.cpp | 132 ++++++++++++++--------------- + qtbase/tools/configure/configureapp.cpp | 132 +++++++++++++++---------------- 1 files changed, 65 insertions(+), 67 deletions(-) diff --git a/qtbase/tools/configure/configureapp.cpp b/qtbase/tools/configure/configureapp.cpp -index bf0925e..2f64957 100644 +index 914061e..6fe46b2 100644 --- a/qtbase/tools/configure/configureapp.cpp +++ b/qtbase/tools/configure/configureapp.cpp @@ -188,7 +188,7 @@ Configure::Configure(int& argc, char** argv) |