From 7b37d1bc4f6b27188b0688dcdc2b89db3101575c Mon Sep 17 00:00:00 2001 From: Fathi Boudra Date: Fri, 20 Feb 2009 20:24:25 +0000 Subject: Merge Qt4 4.5 branch to trunk. --- debian/patches/15_fix_qmake_makefile_generation.diff | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/patches/15_fix_qmake_makefile_generation.diff') diff --git a/debian/patches/15_fix_qmake_makefile_generation.diff b/debian/patches/15_fix_qmake_makefile_generation.diff index 17f810b..0ea1af5 100644 --- a/debian/patches/15_fix_qmake_makefile_generation.diff +++ b/debian/patches/15_fix_qmake_makefile_generation.diff @@ -1,6 +1,6 @@ --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -2328,7 +2328,7 @@ MakefileGenerator::writeSubTargets(QText +@@ -2329,7 +2329,7 @@ MakefileGenerator::writeSubTargets(QText QString mkfile = subtarget->makefile; if(!in_directory.isEmpty()) -- cgit v1.2.3