diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2012-05-29 05:32:47 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-08 09:19:40 (GMT) |
| commit | b870caf6d29d493c7dbe1d5cb8e255d8648a55e6 (patch) | |
| tree | 3f1aab142e170a2fd0d420aed06152716d65d1a0 /src | |
| parent | e5205aa2470018fe6ab8b1b01a30355f7aca1f62 (diff) | |
| download | Qt-b870caf6d29d493c7dbe1d5cb8e255d8648a55e6.zip Qt-b870caf6d29d493c7dbe1d5cb8e255d8648a55e6.tar.gz Qt-b870caf6d29d493c7dbe1d5cb8e255d8648a55e6.tar.bz2 | |
Compile with clang when C++11 support is enabled
text/qtextdocument_p.cpp:1070:43: error: non-constant-expression cannot
be narrowed from type 'int' to 'quint32' (aka 'unsigned int') in
initializer list [-Wc++11-narrowing]
text/qtextdocument_p.cpp:1070:43: note: override this message by
inserting an explicit cast
Cherry-picked from qtbase/6deebc817080f9eb86d5d6fbe50444678eed4dfe.
Change-Id: Id3faf59a8d30dc829b82508c4be50439db1d9722
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/text/qtextdocument_p.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qtextdocument_p.cpp b/src/gui/text/qtextdocument_p.cpp index ffc8734..cd6432b 100644 --- a/src/gui/text/qtextdocument_p.cpp +++ b/src/gui/text/qtextdocument_p.cpp @@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE // The VxWorks DIAB compiler crashes when initializing the anonymouse union with { a7 } #if !defined(Q_CC_DIAB) # define QT_INIT_TEXTUNDOCOMMAND(c, a1, a2, a3, a4, a5, a6, a7, a8) \ - QTextUndoCommand c = { a1, a2, 0, 0, quint8(a3), a4, a5, a6, { a7 }, a8 } + QTextUndoCommand c = { a1, a2, 0, 0, quint8(a3), a4, quint32(a5), quint32(a6), { int(a7) }, quint32(a8) } #else # define QT_INIT_TEXTUNDOCOMMAND(c, a1, a2, a3, a4, a5, a6, a7, a8) \ QTextUndoCommand c = { a1, a2, 0, 0, a3, a4, a5, a6 }; c.blockFormat = a7; c.revision = a8 |