path: root/src/gui/text/qtextdocument_p.cpp
diff options
authorThiago Macieira <>2014-09-10 20:37:51 -0700
committerThiago Macieira <>2014-11-01 00:30:37 +0100
commitebef2ad1360c80ad62de5f4a1c4e7e4051725c1c (patch)
tree07bf59e33501a24cee376efc0d2955b34df476c3 /src/gui/text/qtextdocument_p.cpp
parent791c975c55d26c639d205b58152fd5e9b5f3a85d (diff)
Make the empty Q_ASSERT still check its argument for validity
With the side-effect that variables and functions in the argument are now "used". This means we don't need to #ifndef functions only used in assertions: the compiler will eliminate them by dead code elimination. Due to the mandatory short-circuiting of the condition, no functions will ever be called and this expands to no more code than before. On the negative side, because we won't get warnings for unused variables initialized outside the Q_ASSERT, non-inlineable calls will not be elminated by dead code elimination, so they will remain in release code without warnings. Because of the expanded code now in Q_ASSERT, the Intel compiler's optimizer gets thrown: it complains that the non-void function is failing to return anything, so I had to add two return statements. Change-Id: I1bb79c9637a2771ef1ec093f901b8d2443788bd6 Reviewed-by: Marc Mutz <> Reviewed-by: Jędrzej Nowacki <>
Diffstat (limited to 'src/gui/text/qtextdocument_p.cpp')
1 files changed, 0 insertions, 2 deletions
diff --git a/src/gui/text/qtextdocument_p.cpp b/src/gui/text/qtextdocument_p.cpp
index 8ff15106e3..d30ff78b8f 100644
--- a/src/gui/text/qtextdocument_p.cpp
+++ b/src/gui/text/qtextdocument_p.cpp
@@ -125,14 +125,12 @@ static bool isValidBlockSeparator(QChar ch)
|| ch == QTextEndOfFrame;
-#if !defined(QT_NO_DEBUG) || defined(QT_FORCE_ASSERTS)
static bool noBlockInString(const QString &str)
return !str.contains(QChar::ParagraphSeparator)
&& !str.contains(QTextBeginningOfFrame)
&& !str.contains(QTextEndOfFrame);
bool QTextUndoCommand::tryMerge(const QTextUndoCommand &other)