summaryrefslogtreecommitdiffstats
path: root/patches/0036-Made-modules-that-depend-on-other-modules-add-their-.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/0036-Made-modules-that-depend-on-other-modules-add-their-.patch')
-rw-r--r--patches/0036-Made-modules-that-depend-on-other-modules-add-their-.patch9
1 files changed, 5 insertions, 4 deletions
diff --git a/patches/0036-Made-modules-that-depend-on-other-modules-add-their-.patch b/patches/0036-Made-modules-that-depend-on-other-modules-add-their-.patch
index ca93d54..7c6f2f0 100644
--- a/patches/0036-Made-modules-that-depend-on-other-modules-add-their-.patch
+++ b/patches/0036-Made-modules-that-depend-on-other-modules-add-their-.patch
@@ -1,7 +1,8 @@
-From 88922fd80297b74f547389db3ddfb9950e356145 Mon Sep 17 00:00:00 2001
+From 515a3c3470c51406acc36bf89c686b177e5c03c5 Mon Sep 17 00:00:00 2001
From: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Date: Tue, 4 Jan 2011 16:37:10 +0100
-Subject: [PATCH] Made modules that depend on other modules add their include paths.
+Subject: [PATCH] Made modules that depend on other modules add their include
+ paths.
This is needed so that header files which contain references to those
modules (for example in templates) will have their include paths as
@@ -13,7 +14,7 @@ RevBy: axis
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/qtbase/mkspecs/features/qt.prf b/qtbase/mkspecs/features/qt.prf
-index 3b9c645..c1584fc 100644
+index 4d8e465..419bb92 100644
--- a/qtbase/mkspecs/features/qt.prf
+++ b/qtbase/mkspecs/features/qt.prf
@@ -124,6 +124,7 @@ QMAKE_LIBDIR += $$QMAKE_LIBDIR_QT
@@ -39,5 +40,5 @@ index 3b9c645..c1584fc 100644
!qt_compat_no_warning:QTDIR_build:warning(***USE of COMPAT inside of QTDIR!**) #just for us
INCLUDEPATH *= $$QMAKE_INCDIR_QT/Qt
--
-1.7.3.2.343.g7d43d
+1.7.5.rc2.4.g4d8b3