diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-06-06 07:01:06 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-06-06 07:01:06 +0200 |
| commit | 046ab0b7a3485dfb005639403e4c3120b7b3fc0e (patch) | |
| tree | 9630b4c104e71de843081dbdb9d661168048afba /src/tools | |
| parent | 871fb84e930a7ceb6b8b8ca88e5e6c30abb32148 (diff) | |
| parent | e459bc6091cf73d88e366c471b1747a5f62c56ba (diff) | |
Merge remote-tracking branch 'origin/4.10'
Change-Id: Ie1861bb221a9974d78938e9a2078c1f6aa207210
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/cplusplus-ast2png/cplusplus-ast2png.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/tools/cplusplus-ast2png/cplusplus-ast2png.cpp b/src/tools/cplusplus-ast2png/cplusplus-ast2png.cpp index 59aab237ec..ad69adae56 100644 --- a/src/tools/cplusplus-ast2png/cplusplus-ast2png.cpp +++ b/src/tools/cplusplus-ast2png/cplusplus-ast2png.cpp @@ -423,12 +423,11 @@ public: static const char *const pretty[] = {"warning", "error", "fatal"}; - QString str; - str.sprintf("%s:%d:%d: When parsing as %s: %s: ", fileName->chars(), line, column, + QString str = QString::asprintf("%s:%d:%d: When parsing as %s: %s: ", fileName->chars(), line, column, parseModeToString(m_parseMode).toUtf8().constData(), pretty[level]); m_errorString->append(str.toUtf8()); - str.vsprintf(format, ap); + str += QString::vasprintf(format, ap); m_errorString->append(str.toUtf8()); m_errorString->append('\n'); } |