diff options
| author | Fathi Boudra <fabo@debian.org> | 2009-02-20 20:24:25 +0000 |
|---|---|---|
| committer | Fathi Boudra <fabo@debian.org> | 2009-02-20 20:24:25 +0000 |
| commit | 7b37d1bc4f6b27188b0688dcdc2b89db3101575c (patch) | |
| tree | dccc02bc71441fbb202d0bfd622af264fc33c89f /debian/patches/15_fix_qmake_makefile_generation.diff | |
| parent | 6ad728b38295ae6479662a58b8c640f389bfa607 (diff) | |
| download | qt4-x11-7b37d1bc4f6b27188b0688dcdc2b89db3101575c.tar.gz | |
Merge Qt4 4.5 branch to trunk.debian/4.5.0-rc1-1
Diffstat (limited to 'debian/patches/15_fix_qmake_makefile_generation.diff')
| -rw-r--r-- | debian/patches/15_fix_qmake_makefile_generation.diff | 2 |
1 files changed, 1 insertions, 1 deletions
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()) |