diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2016-01-08 12:30:57 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2016-01-08 12:35:24 +0100 |
| commit | ad16478a76815f8f61d454bf7760aaf9ffbb4b51 (patch) | |
| tree | eefdd9219cc9d59b62e042f49fc7555b980cb7a4 /qmake/option.cpp | |
| 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/option.cpp')
| -rw-r--r-- | qmake/option.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qmake/option.cpp b/qmake/option.cpp index 1d1aece626..3c9b672be9 100644 --- a/qmake/option.cpp +++ b/qmake/option.cpp @@ -602,8 +602,9 @@ void EvalHandler::message(int type, const QString &msg, const QString &fileName, fprintf(stderr, "%s%s\n", qPrintable(pfx), qPrintable(msg)); } -void EvalHandler::fileMessage(const QString &msg) +void EvalHandler::fileMessage(int type, const QString &msg) { + Q_UNUSED(type) fprintf(stderr, "%s\n", qPrintable(msg)); } |