diff options
Diffstat (limited to 'patches/0078-Make-qmake-respect-subdir-.CONFIG-no_default_install.patch')
| -rw-r--r-- | patches/0078-Make-qmake-respect-subdir-.CONFIG-no_default_install.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/patches/0078-Make-qmake-respect-subdir-.CONFIG-no_default_install.patch b/patches/0078-Make-qmake-respect-subdir-.CONFIG-no_default_install.patch index 7df41f0..034c4a4 100644 --- a/patches/0078-Make-qmake-respect-subdir-.CONFIG-no_default_install.patch +++ b/patches/0078-Make-qmake-respect-subdir-.CONFIG-no_default_install.patch @@ -1,4 +1,4 @@ -From a86c1895c7a209947d87ebfce25761c7638e9cac Mon Sep 17 00:00:00 2001 +From 2dafeb1c875f81af7815e338a6320c6adb95d2e6 Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Date: Thu, 24 Feb 2011 13:01:18 -0600 Subject: [PATCH] Make qmake respect <subdir>.CONFIG = no_default_install @@ -9,10 +9,10 @@ It already respects no_default_target 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/qtbase/qmake/generators/makefile.cpp b/qtbase/qmake/generators/makefile.cpp -index 595768f..4c41559 100644 +index 9e2be31..1c4f74b2 100644 --- a/qtbase/qmake/generators/makefile.cpp +++ b/qtbase/qmake/generators/makefile.cpp -@@ -2567,6 +2567,10 @@ MakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator::SubT +@@ -2569,6 +2569,10 @@ MakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator::SubT && project->values(subTarget->name + ".CONFIG").indexOf("no_default_target") != -1) { continue; } @@ -24,5 +24,5 @@ index 595768f..4c41559 100644 if(flags & SubTargetOrdered) targetRule += "-ordered"; -- -1.7.3.2.343.g7d43d +1.7.5.rc2.4.g4d8b3 |