projects
/
profile
/
ivi
/
qtbase.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d2e83f3
)
Fix return type of isActiveConfig("host_build")
author
Simon Hausmann
<simon.hausmann@nokia.com>
Sat, 23 Jun 2012 15:52:41 +0000
(17:52 +0200)
committer
Qt by Nokia
<qt-info@nokia.com>
Sun, 24 Jun 2012 19:22:51 +0000
(21:22 +0200)
The return type of isActiveConfig is a boolean, so return that when
host_build is queried.
Change-Id: I6d1420b49b09e51442c4b2d482e2f19b165081d8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
qmake/project.cpp
patch
|
blob
|
history
diff --git
a/qmake/project.cpp
b/qmake/project.cpp
index
3a34aef
..
6e79f7a
100644
(file)
--- a/
qmake/project.cpp
+++ b/
qmake/project.cpp
@@
-1691,7
+1691,7
@@
QMakeProject::isActiveConfig(const QString &x, bool regex, QHash<QString, QStrin
}
if (x == "host_build")
- return host_build
? "true" : "false"
;
+ return host_build;
//mkspecs
static QString hspec, xspec;