diff options
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 | 14 |
1 files changed, 7 insertions, 7 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 50a97e6..2f0f726 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 9395e18728811d9dbbd03f12cbbe97c00d9cfe1b Mon Sep 17 00:00:00 2001 +From 2bcc436c862e706c583a31242f72907188a2a635 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 @@ -12,7 +12,7 @@ Also, 1 files changed, 65 insertions(+), 67 deletions(-) diff --git a/qtbase/tools/configure/configureapp.cpp b/qtbase/tools/configure/configureapp.cpp -index 914061e..6fe46b2 100644 +index 2d84ad5..9c2ce2c 100644 --- a/qtbase/tools/configure/configureapp.cpp +++ b/qtbase/tools/configure/configureapp.cpp @@ -188,7 +188,7 @@ Configure::Configure(int& argc, char** argv) @@ -24,7 +24,7 @@ index 914061e..6fe46b2 100644 syncqt_bat.close(); } } -@@ -1595,9 +1595,6 @@ void Configure::applySpecSpecifics() +@@ -1593,9 +1593,6 @@ void Configure::applySpecSpecifics() dictionary[ "SQL_SQLITE" ] = "yes"; dictionary[ "SQL_SQLITE_LIB" ] = "system"; @@ -34,7 +34,7 @@ index 914061e..6fe46b2 100644 } else if (dictionary[ "XQMAKESPEC" ].startsWith("linux")) { //TODO actually wrong. //TODO dictionary[ "STYLE_WINDOWSXP" ] = "no"; -@@ -2684,7 +2681,7 @@ void Configure::generateOutputVars() +@@ -2682,7 +2679,7 @@ void Configure::generateOutputVars() qmakeVars += "QT_LFLAGS_SQLITE += " + escapeSeparators(dictionary["QT_LFLAGS_SQLITE"]); if (dictionary[ "QT3SUPPORT" ] == "yes") @@ -43,7 +43,7 @@ index 914061e..6fe46b2 100644 if (dictionary[ "OPENGL" ] == "yes") qtConfig += "opengl"; -@@ -2729,51 +2726,52 @@ void Configure::generateOutputVars() +@@ -2727,51 +2724,52 @@ void Configure::generateOutputVars() if (dictionary[ "CETEST" ] == "yes") qtConfig += "cetest"; @@ -123,7 +123,7 @@ index 914061e..6fe46b2 100644 if (dictionary["DIRECTWRITE"] == "yes") qtConfig += "directwrite"; -@@ -2924,81 +2922,81 @@ void Configure::generateCachefile() +@@ -2922,81 +2920,81 @@ void Configure::generateCachefile() } // Generate qmodule.pri @@ -241,5 +241,5 @@ index 914061e..6fe46b2 100644 // Generate qconfig.pri -- -1.7.3.2.343.g7d43d +1.7.5.rc2.4.g4d8b3 |