summaryrefslogtreecommitdiffstats
path: root/patches/0024-Add-the-source-path-to-the-modules-.pri-file.patch
diff options
context:
space:
mode:
authoraxis <[email protected]>2011-04-27 13:01:17 +0200
committeraxis <[email protected]>2011-04-27 13:01:17 +0200
commit1a0d5aeb9197ea0c3432903c402d8449bea9f6b4 (patch)
tree3fbb60e2a0bff38c9cabfb1b5d347579e8769f93 /patches/0024-Add-the-source-path-to-the-modules-.pri-file.patch
parent2f66cb61ffbf147292092ebe29e3d4759dfb9bda (diff)
Fixes for the second final push (the first one failed).HEADmaster
Diffstat (limited to 'patches/0024-Add-the-source-path-to-the-modules-.pri-file.patch')
-rw-r--r--patches/0024-Add-the-source-path-to-the-modules-.pri-file.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/patches/0024-Add-the-source-path-to-the-modules-.pri-file.patch b/patches/0024-Add-the-source-path-to-the-modules-.pri-file.patch
index 0f6acf9..e3f45c7 100644
--- a/patches/0024-Add-the-source-path-to-the-modules-.pri-file.patch
+++ b/patches/0024-Add-the-source-path-to-the-modules-.pri-file.patch
@@ -1,4 +1,4 @@
-From 081072fb6c23ea8a72fef472a9ec07a52919702c Mon Sep 17 00:00:00 2001
+From 87b33b5c6750512443a2b9042bbd7328a112a528 Mon Sep 17 00:00:00 2001
From: Marius Storm-Olsen <[email protected]>
Date: Thu, 16 Dec 2010 23:34:20 -0600
Subject: [PATCH] Add the source path to the modules .pri file
@@ -36,10 +36,10 @@ index 400b69c..86d6395 100644
QT.qt3support.depends = core gui
QT.qt3support.DEFINES = QT3_SUPPORT
diff --git a/qtbase/bin/syncqt b/qtbase/bin/syncqt
-index 37e408c..5ac4fd2 100755
+index ac540ea..c3e28ec 100755
--- a/qtbase/bin/syncqt
+++ b/qtbase/bin/syncqt
-@@ -1004,6 +1004,7 @@ foreach my $lib (@modules_to_sync) {
+@@ -1006,6 +1006,7 @@ foreach my $lib (@modules_to_sync) {
my $modulepriname = basename($modulepri);
my $moduleprifwd = "$qtbasedir/mkspecs/modules/$modulepriname";
open MODULE_PRI_FILE, ">$moduleprifwd";
@@ -217,5 +217,5 @@ index ac83022..a11c06a 100644
QT.xmlpatterns.libs = $$QT_MODULE_LIB_BASE
QT.xmlpatterns.depends = core network
--
-1.7.3.2.343.g7d43d
+1.7.3.4