summaryrefslogtreecommitdiffstats
path: root/patches/0037-Make-each-module-refer-to-its-own-bin.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/0037-Make-each-module-refer-to-its-own-bin.patch')
-rw-r--r--patches/0037-Make-each-module-refer-to-its-own-bin.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/patches/0037-Make-each-module-refer-to-its-own-bin.patch b/patches/0037-Make-each-module-refer-to-its-own-bin.patch
index 2f500b7..064a435 100644
--- a/patches/0037-Make-each-module-refer-to-its-own-bin.patch
+++ b/patches/0037-Make-each-module-refer-to-its-own-bin.patch
@@ -1,4 +1,4 @@
-From 384cc04756a692e4dd9363cabc701ace2254adbd Mon Sep 17 00:00:00 2001
+From 0a07f5e4a5bd7063fa1838f6c74da28b96da7378 Mon Sep 17 00:00:00 2001
From: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Date: Thu, 6 Jan 2011 12:52:17 -0600
Subject: [PATCH] Make each module refer to its own bin/
@@ -45,10 +45,10 @@ index 5554999..f78c269 100644
QT.qt3support.private_includes = $$QT_MODULE_INCLUDE_BASE/Qt3Support/private
QT.qt3support.sources = $$QT_MODULE_BASE/src/qt3support
diff --git a/qtbase/bin/syncqt b/qtbase/bin/syncqt
-index abd4c06..d575c33 100755
+index 6af59c4..a5434ca 100755
--- a/qtbase/bin/syncqt
+++ b/qtbase/bin/syncqt
-@@ -1006,6 +1006,7 @@ foreach my $lib (@modules_to_sync) {
+@@ -1008,6 +1008,7 @@ foreach my $lib (@modules_to_sync) {
my $moduleprifwd = "$qtbasedir/mkspecs/modules/$modulepriname";
open MODULE_PRI_FILE, ">$moduleprifwd";
print MODULE_PRI_FILE "QT_MODULE_BASE = $basedir\n";
@@ -268,7 +268,7 @@ index 01340ac..a617834 100644
QT.designer.private_includes = $$QT_MODULE_INCLUDE_BASE/QtDesigner/private
QT.designer.sources = $$QT_MODULE_BASE/src/designer/src/lib
diff --git a/qttools/modules/qt_help.pri b/qttools/modules/qt_help.pri
-index d99f57aa..07e815d 100644
+index d99f57a..07e815d 100644
--- a/qttools/modules/qt_help.pri
+++ b/qttools/modules/qt_help.pri
@@ -4,6 +4,7 @@ QT_HELP_MINOR_VERSION = $$QT_MINOR_VERSION
@@ -304,5 +304,5 @@ index a5a50e6..329b784 100644
QT.xmlpatterns.private_includes = $$QT_MODULE_INCLUDE_BASE/QtXmlPatterns/private
QT.xmlpatterns.sources = $$QT_MODULE_BASE/src/xmlpatterns
--
-1.7.3.2.343.g7d43d
+1.7.3.4