diff --git a/src/plugins/cppeditor/cppquickfixassistant.cpp b/src/plugins/cppeditor/cppquickfixassistant.cpp
index c6d9c3dc2f5f58539833c0a973155a60b74aded0..262b47950e7b1047fc1d21acfc56ed4a9b153a84 100644
--- a/src/plugins/cppeditor/cppquickfixassistant.cpp
+++ b/src/plugins/cppeditor/cppquickfixassistant.cpp
@@ -50,6 +50,8 @@
 
 #include <extensionsystem/pluginmanager.h>
 
+#include <utils/qtcassert.h>
+
 #include <QFileInfo>
 #include <QTextBlock>
 
@@ -104,7 +106,7 @@ CppQuickFixAssistInterface::CppQuickFixAssistInterface(CPPEditorWidget *editor,
     , m_currentFile(CppRefactoringChanges::file(editor, m_semanticInfo.doc))
     , m_context(m_semanticInfo.doc, m_snapshot)
 {
-    Q_ASSERT(!m_semanticInfo.doc.isNull());
+    QTC_CHECK(!m_semanticInfo.doc.isNull());
     CPlusPlus::ASTPath astPath(m_semanticInfo.doc);
     m_path = astPath(editor->textCursor());
 }
diff --git a/src/plugins/texteditor/refactoringchanges.cpp b/src/plugins/texteditor/refactoringchanges.cpp
index f6d5192232c1e70e0f375c909138677866cfa0a9..00054b99e77e245b3337e1eac6d76ac111ec2603 100644
--- a/src/plugins/texteditor/refactoringchanges.cpp
+++ b/src/plugins/texteditor/refactoringchanges.cpp
@@ -253,8 +253,8 @@ QString RefactoringFile::fileName() const
 
 int RefactoringFile::position(unsigned line, unsigned column) const
 {
-    Q_ASSERT(line != 0);
-    Q_ASSERT(column != 0);
+    QTC_ASSERT(line != 0, return -1);
+    QTC_ASSERT(column != 0, return -1);
     if (const QTextDocument *doc = document())
         return doc->findBlockByNumber(line - 1).position() + column - 1;
     return -1;
@@ -262,9 +262,9 @@ int RefactoringFile::position(unsigned line, unsigned column) const
 
 void RefactoringFile::lineAndColumn(int offset, unsigned *line, unsigned *column) const
 {
-    Q_ASSERT(line);
-    Q_ASSERT(column);
-    Q_ASSERT(offset >= 0);
+    QTC_ASSERT(line, return);
+    QTC_ASSERT(column, return);
+    QTC_ASSERT(offset >= 0, return);
     QTextCursor c(cursor());
     c.setPosition(offset);
     *line = c.blockNumber() + 1;