diff options
Diffstat (limited to 'patches/0006-Make-syncqt-use-sync.profile-files-from-each-module.patch')
| -rw-r--r-- | patches/0006-Make-syncqt-use-sync.profile-files-from-each-module.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/patches/0006-Make-syncqt-use-sync.profile-files-from-each-module.patch b/patches/0006-Make-syncqt-use-sync.profile-files-from-each-module.patch index 5e99eef..f3ab87b 100644 --- a/patches/0006-Make-syncqt-use-sync.profile-files-from-each-module.patch +++ b/patches/0006-Make-syncqt-use-sync.profile-files-from-each-module.patch @@ -1,4 +1,4 @@ -From 72bf0df44486a5030e4ba47e9d4a25bee241f05e Mon Sep 17 00:00:00 2001 +From be0dd0f2149064e9655edaa5d7c24bef3e034dd5 Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Date: Mon, 15 Nov 2010 13:55:17 -0600 Subject: [PATCH] Make syncqt use sync.profile files from each module @@ -251,10 +251,10 @@ index b8162d2..7e5fc44 100755 } } diff --git a/qtbase/configure b/qtbase/configure -index 1fc14e2..7fd1cf3 100755 +index 66464fa..fe9e311 100755 --- a/qtbase/configure +++ b/qtbase/configure -@@ -2542,8 +2542,7 @@ if [ "$OPT_SHADOW" = "yes" ]; then +@@ -2550,8 +2550,7 @@ if [ "$OPT_SHADOW" = "yes" ]; then if [ -x "$relpath/bin/syncqt" ]; then mkdir -p "$outpath/bin" echo "#!/bin/sh" >"$outpath/bin/syncqt" @@ -315,7 +315,7 @@ index 0000000..7d2e4b1 +@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" ); +@ignore_for_qt_module_check = ( "$modules{QtCore}/arch", "$modules{QtCore}/global", "$modules{QtTest}", "$modules{QtDBus}" ); diff --git a/qtbase/tools/configure/configureapp.cpp b/qtbase/tools/configure/configureapp.cpp -index 5ec4cd6..914061e 100644 +index 46f1a87..2d84ad5 100644 --- a/qtbase/tools/configure/configureapp.cpp +++ b/qtbase/tools/configure/configureapp.cpp @@ -188,9 +188,7 @@ Configure::Configure(int& argc, char** argv) @@ -330,5 +330,5 @@ index 5ec4cd6..914061e 100644 } } -- -1.7.3.2.343.g7d43d +1.7.5.rc2.4.g4d8b3 |