diff options
author | Frederik Gladhorn <[email protected]> | 2016-01-08 12:30:57 +0100 |
---|---|---|
committer | Frederik Gladhorn <[email protected]> | 2016-01-08 12:35:24 +0100 |
commit | ad16478a76815f8f61d454bf7760aaf9ffbb4b51 (patch) | |
tree | eefdd9219cc9d59b62e042f49fc7555b980cb7a4 /qmake/library/qmakeparser.h | |
parent | 80a741f3616290897ba0d9f1cbd3c9c5ee62da37 (diff) | |
parent | 09c92863001790a0304a5ef389901ee2b5b6cdc2 (diff) |
Merge remote-tracking branch 'origin/5.6' into dev
Based on merge done by Liang Qi
Change-Id: Id566e5b9f284d29bff2199f13f9417c660f5b26f
Diffstat (limited to 'qmake/library/qmakeparser.h')
-rw-r--r-- | qmake/library/qmakeparser.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/qmake/library/qmakeparser.h b/qmake/library/qmakeparser.h index dfea1ddfdf8..7fa4f62a963 100644 --- a/qmake/library/qmakeparser.h +++ b/qmake/library/qmakeparser.h @@ -50,8 +50,9 @@ class QMAKE_EXPORT QMakeParserHandler public: enum { CategoryMask = 0xf00, - WarningMessage = 0x000, - ErrorMessage = 0x100, + InfoMessage = 0x100, + WarningMessage = 0x200, + ErrorMessage = 0x300, SourceMask = 0xf0, SourceParser = 0, |