diff options
| author | Dyami Caliri <dyami@dragonframe.com> | 2016-08-16 20:52:14 -0700 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2016-09-03 05:07:50 +0000 |
| commit | 816a6238761810c28a991a959ea61a834de2a2a5 (patch) | |
| tree | 14f25fc6565dde3a9b235987b59b21dcaf9abb57 /src/tools/uic | |
| parent | 4e53159d431e39c03488517588669ae2cc9052d1 (diff) | |
uic: generate translate calls with Q_NULLPTR instead of 0
uic should use Q_NULLPTR instead of 0 as the default disambiguation
context.
Task-number: QTBUG-45291
Change-Id: I889182c7fe1c4be3336f3cd645aa60838863c633
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/tools/uic')
| -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 518944d9d7..a59c14faf9 100644 --- a/src/tools/uic/cpp/cppwriteinitialization.cpp +++ b/src/tools/uic/cpp/cppwriteinitialization.cpp @@ -2320,7 +2320,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()) { result = QLatin1String("QApplication::translate(\""); |