summaryrefslogtreecommitdiffstats
path: root/qmake/project.h
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2012-09-19 21:56:16 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-09-21 02:44:22 +0200
commit0da7f097249f71726140a38647bb4824b09fad7b (patch)
treee305e9660beb4b4305d3781e8403de86e186a99c /qmake/project.h
parentb6acec1e5d55d03ad3a0a70d2cf371d3f8fde629 (diff)
make error() abort the qmake run, not just the current file
Change-Id: I82fc55680f9ffb227e25acb39c797596225ba89e Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'qmake/project.h')
-rw-r--r--qmake/project.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/qmake/project.h b/qmake/project.h
index 3b5e57cd90..5183c96765 100644
--- a/qmake/project.h
+++ b/qmake/project.h
@@ -78,6 +78,7 @@ public:
void dump() const;
using QMakeEvaluator::LoadFlags;
+ using QMakeEvaluator::VisitReturn;
using QMakeEvaluator::setExtraVars;
using QMakeEvaluator::setExtraConfigs;
using QMakeEvaluator::loadSpec;
@@ -89,6 +90,9 @@ public:
using QMakeEvaluator::isActiveConfig;
using QMakeEvaluator::isHostBuild;
using QMakeEvaluator::dirSep;
+
+private:
+ static bool boolRet(VisitReturn vr);
};
inline int QMakeProject::intValue(const ProKey &v, int defaultValue) const