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 /tests/auto | |
parent | 871fb84e930a7ceb6b8b8ca88e5e6c30abb32148 (diff) | |
parent | e459bc6091cf73d88e366c471b1747a5f62c56ba (diff) |
Merge remote-tracking branch 'origin/4.10'
Change-Id: Ie1861bb221a9974d78938e9a2078c1f6aa207210
Diffstat (limited to 'tests/auto')
-rw-r--r-- | tests/auto/cplusplus/ast/tst_ast.cpp | 2 | ||||
-rw-r--r-- | tests/auto/cplusplus/c99/tst_c99.cpp | 5 | ||||
-rw-r--r-- | tests/auto/cplusplus/cxx11/tst_cxx11.cpp | 5 | ||||
-rw-r--r-- | tests/auto/cplusplus/semantic/tst_semantic.cpp | 2 | ||||
-rw-r--r-- | tests/auto/cplusplus/translationunit/tst_translationunit.cpp | 2 |
5 files changed, 7 insertions, 9 deletions
diff --git a/tests/auto/cplusplus/ast/tst_ast.cpp b/tests/auto/cplusplus/ast/tst_ast.cpp index 0cf9c7a560..e444a4b8e5 100644 --- a/tests/auto/cplusplus/ast/tst_ast.cpp +++ b/tests/auto/cplusplus/ast/tst_ast.cpp @@ -97,7 +97,7 @@ public: { ++errorCount; - qDebug() << fileName->chars()<<':'<<line<<':'<<column<<' '<<QString().vsprintf(format, ap); + qDebug() << fileName->chars()<<':'<<line<<':'<<column<<' ' << QString::vasprintf(format, ap); } }; diff --git a/tests/auto/cplusplus/c99/tst_c99.cpp b/tests/auto/cplusplus/c99/tst_c99.cpp index df33671907..edcb5f955f 100644 --- a/tests/auto/cplusplus/c99/tst_c99.cpp +++ b/tests/auto/cplusplus/c99/tst_c99.cpp @@ -83,11 +83,10 @@ class tst_c99: public QObject static const char *const pretty[] = {"warning", "error", "fatal"}; - QString str; - str.sprintf("%s:%d:%d: %s: ", fileName->chars(), line, column, pretty[level]); + QString str = QString::asprintf("%s:%d:%d: %s: ", fileName->chars(), line, column, pretty[level]); errors->append(str.toUtf8()); - str.vsprintf(format, ap); + str += QString::vasprintf(format, ap); errors->append(str.toUtf8()); errors->append('\n'); diff --git a/tests/auto/cplusplus/cxx11/tst_cxx11.cpp b/tests/auto/cplusplus/cxx11/tst_cxx11.cpp index 108d93f18f..abef7cc1e1 100644 --- a/tests/auto/cplusplus/cxx11/tst_cxx11.cpp +++ b/tests/auto/cplusplus/cxx11/tst_cxx11.cpp @@ -85,11 +85,10 @@ class tst_cxx11: public QObject static const char *const pretty[] = {"warning", "error", "fatal"}; - QString str; - str.sprintf("%s:%d:%d: %s: ", fileName->chars(), line, column, pretty[level]); + QString str = QString::asprintf("%s:%d:%d: %s: ", fileName->chars(), line, column, pretty[level]); errors->append(str.toUtf8()); - str.vsprintf(format, ap); + str += QString::vasprintf(format, ap); errors->append(str.toUtf8()); errors->append('\n'); diff --git a/tests/auto/cplusplus/semantic/tst_semantic.cpp b/tests/auto/cplusplus/semantic/tst_semantic.cpp index 3904558efc..e13795154b 100644 --- a/tests/auto/cplusplus/semantic/tst_semantic.cpp +++ b/tests/auto/cplusplus/semantic/tst_semantic.cpp @@ -120,7 +120,7 @@ public: ++errorCount; #ifndef NO_PARSER_OR_SEMANTIC_ERROR_MESSAGES - qDebug() << fileName->chars()<<':'<<line<<':'<<column<<' '<<QString().vsprintf(format, ap); + qDebug() << fileName->chars()<<':'<<line<<':'<<column<<' ' << QString::vasprintf(format, ap); #else Q_UNUSED(fileName); Q_UNUSED(line); diff --git a/tests/auto/cplusplus/translationunit/tst_translationunit.cpp b/tests/auto/cplusplus/translationunit/tst_translationunit.cpp index 4a2159bf04..2c651676bc 100644 --- a/tests/auto/cplusplus/translationunit/tst_translationunit.cpp +++ b/tests/auto/cplusplus/translationunit/tst_translationunit.cpp @@ -133,7 +133,7 @@ private: { ++errorCount; qDebug() << fileName->chars() << ':' << line << ':' << column - << ' ' << QString().vsprintf(format, ap); + << ' ' << QString::vasprintf(format, ap); } } m_diagnosticClient; }; |