diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-05 06:39:30 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-05 13:57:12 +0200 |
| commit | 657c2bfbeceda3faa2c7a76b4ccec6a65a3445a2 (patch) | |
| tree | 83e0a1dab04afb291e181bb8fb6152ba96678795 /src/tools/uic/cpp/cppwriteinitialization.cpp | |
| parent | 676129d7ee57347798683d444823e7723776d8ec (diff) | |
| parent | b94111116f09a6e48741d35cf7abea47af99ef26 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
tests/auto/testlib/selftests/generate_expected_output.py
Change-Id: If856162abf9a24ae2c9946d336a7d1da03520fa7
Diffstat (limited to 'src/tools/uic/cpp/cppwriteinitialization.cpp')
| -rw-r--r-- | src/tools/uic/cpp/cppwriteinitialization.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp index 714841d6cff..dfc7ee3a61e 100644 --- a/src/tools/uic/cpp/cppwriteinitialization.cpp +++ b/src/tools/uic/cpp/cppwriteinitialization.cpp @@ -2311,7 +2311,7 @@ QString WriteInitialization::trCall(const QString &str, const QString &commentHi return QLatin1String("QString()"); QString result; - const QString comment = commentHint.isEmpty() ? QString(QLatin1Char('0')) : fixString(commentHint, m_dindent); + const QString comment = commentHint.isEmpty() ? QString(QLatin1String("Q_NULLPTR")) : fixString(commentHint, m_dindent); if (m_option.translateFunction.isEmpty()) { if (m_option.idBased) { |