diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-09-02 16:43:49 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-01-04 14:27:55 +0000 |
| commit | 33ad0f103111aa3f65c6c0736a0745db8a4ef64a (patch) | |
| tree | 171aad08350bd268320d6b8152d94a9eac2b0abe /src/shared/proparser/qmakeevaluator.h | |
| parent | 4996eb34339d86e4f3f5665e975c5da20226841e (diff) | |
| download | qt-creator-33ad0f103111aa3f65c6c0736a0745db8a4ef64a.tar.gz | |
report to message handler whether evaluating cumulatively
we evaluate prf files precisely even when the pro file is evaluated
cumulatively. the message handler should know the mode a message is
reported in.
this just syncs up with qttools/08d0cb6f8e90a818bf6d3bec7a6d00f16419b8c0
and qttools/ea1a5c3534f089c0e704808a0fb029eda8f753b4 without
user-visible effect.
Change-Id: Ia14953a5a9dc31af56ad6c338017dd5b85bb4494
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'src/shared/proparser/qmakeevaluator.h')
| -rw-r--r-- | src/shared/proparser/qmakeevaluator.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/shared/proparser/qmakeevaluator.h b/src/shared/proparser/qmakeevaluator.h index 31d05e74c7..8538e8b4f0 100644 --- a/src/shared/proparser/qmakeevaluator.h +++ b/src/shared/proparser/qmakeevaluator.h @@ -65,6 +65,8 @@ public: enum { SourceEvaluator = 0x10, + CumulativeEvalMessage = 0x1000, + EvalWarnLanguage = SourceEvaluator | WarningMessage | WarnLanguage, EvalWarnDeprecated = SourceEvaluator | WarningMessage | WarnDeprecated, @@ -72,7 +74,7 @@ public: }; // error(), warning() and message() from .pro file - virtual void fileMessage(const QString &msg) = 0; + virtual void fileMessage(int type, const QString &msg) = 0; enum EvalFileType { EvalProjectFile, EvalIncludeFile, EvalConfigFile, EvalFeatureFile, EvalAuxFile }; virtual void aboutToEval(ProFile *parent, ProFile *proFile, EvalFileType type) = 0; |