summaryrefslogtreecommitdiffstats
path: root/qmake/library/qmakeparser.h
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2015-02-19 13:25:10 +0100
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2015-02-25 13:55:01 +0000
commitb7e839fbbd366863292566afbe736d7432d439ea (patch)
tree8875a4935789535ef71676508cfcc5bcb5e11031 /qmake/library/qmakeparser.h
parent73c84fb32bfb09a87d3a63b1f0c78d3f500ba20b (diff)
don't make an even number of bangs almost entirely invisible
otherwise we'd silently accept this nonsensical code: !!defineTest(foo) {} Change-Id: I66b59c8a89852c6451ce8d7269a3dc66a53e3b1f Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'qmake/library/qmakeparser.h')
-rw-r--r--qmake/library/qmakeparser.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/library/qmakeparser.h b/qmake/library/qmakeparser.h
index 66b26ac759..5c416b26f5 100644
--- a/qmake/library/qmakeparser.h
+++ b/qmake/library/qmakeparser.h
@@ -175,7 +175,7 @@ private:
int m_markLine; // Put marker for this line
bool m_inError; // Current line had a parsing error; suppress followup error messages
bool m_canElse; // Conditionals met on previous line, but no scope was opened
- bool m_invert; // Pending conditional is negated
+ int m_invert; // Pending conditional is negated
enum { NoOperator, AndOperator, OrOperator } m_operator; // Pending conditional is ORed/ANDed
QString m_tmp; // Temporary for efficient toQString