blob: 7df41f033cbf398437cfa4b3d1c00fafd9620198 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
|
From a86c1895c7a209947d87ebfce25761c7638e9cac 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
It already respects no_default_target
---
qtbase/qmake/generators/makefile.cpp | 4 ++++
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
--- a/qtbase/qmake/generators/makefile.cpp
+++ b/qtbase/qmake/generators/makefile.cpp
@@ -2567,6 +2567,10 @@ MakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator::SubT
&& project->values(subTarget->name + ".CONFIG").indexOf("no_default_target") != -1) {
continue;
}
+ if((suffix == "install_subtargets" || suffix == "uninstall_subtargets")
+ && project->values(subTarget->name + ".CONFIG").indexOf("no_default_install") != -1) {
+ continue;
+ }
QString targetRule = subTarget->target + "-" + suffix;
if(flags & SubTargetOrdered)
targetRule += "-ordered";
--
1.7.3.2.343.g7d43d
|
