New QTC_CHECK warning replacing QTC_ASSERT(x, /**/)

Warn if the condition fails, but otherwise don't change the execution
flow.

Change-Id: Id7b14c745109b66960add967b2a4ef8d31e1a546
Reviewed-on: http://codereview.qt.nokia.com/2389
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

40 files changed, 86 insertions, 83 deletions

diff --git a/src/libs/utils/classnamevalidatinglineedit.cpp b/src/libs/utils/classnamevalidatinglineedit.cpp
index baaa45f4d3..5d89eed4a2 100644
--- a/src/libs/utils/classnamevalidatinglineedit.cpp
+++ b/src/libs/utils/classnamevalidatinglineedit.cpp
@@ -125,7 +125,7 @@ QString ClassNameValidatingLineEdit::createClassName(const QString &name)
     // Remove spaces and convert the adjacent characters to uppercase
     QString className = name;
     QRegExp spaceMatcher(QLatin1String(" +(\\w)"), Qt::CaseSensitive, QRegExp::RegExp2);
-    QTC_ASSERT(spaceMatcher.isValid(), /**/);
+    QTC_CHECK(spaceMatcher.isValid());
     int pos;
     while ((pos = spaceMatcher.indexIn(className)) != -1) {
         className.replace(pos, spaceMatcher.matchedLength(),
diff --git a/src/libs/utils/qtcassert.h b/src/libs/utils/qtcassert.h
index 5d2eb1ac70..c33581b76b 100644
--- a/src/libs/utils/qtcassert.h
+++ b/src/libs/utils/qtcassert.h
@@ -44,5 +44,8 @@
 #define QTC_ASSERT(cond, action) \
     if(cond){}else{qDebug()<<"ASSERTION " #cond " FAILED AT " __FILE__ ":" QTC_ASSERT_STRINGIFY(__LINE__);action;}
 
+#define QTC_CHECK(cond) \
+    if(cond){}else{qDebug()<<"ASSERTION " #cond " FAILED AT " __FILE__ ":" QTC_ASSERT_STRINGIFY(__LINE__);}
+
 #endif // QTC_ASSERT_H
 
diff --git a/src/plugins/analyzerbase/analyzermanager.cpp b/src/plugins/analyzerbase/analyzermanager.cpp
index 773a09a9a5..7824f77fbb 100644
--- a/src/plugins/analyzerbase/analyzermanager.cpp
+++ b/src/plugins/analyzerbase/analyzermanager.cpp
@@ -602,7 +602,7 @@ QAction *AnalyzerManagerPrivate::actionFromToolAndMode(IAnalyzerTool *tool, Star
     foreach (QAction *action, m_actions)
         if (m_toolFromAction.value(action) == tool && m_modeFromAction[action] == mode)
             return action;
-    QTC_ASSERT(false, /**/);
+    QTC_CHECK(false);
     return 0;
 }
 
@@ -666,9 +666,9 @@ void AnalyzerManagerPrivate::selectTool(IAnalyzerTool *tool, StartMode mode)
 
     if (!m_defaultSettings.contains(tool)) {
         QWidget *widget = tool->createWidgets();
-        QTC_ASSERT(widget, /**/);
+        QTC_CHECK(widget);
         m_defaultSettings.insert(tool, m_mainWindow->saveSettings());
-        QTC_ASSERT(!m_controlsWidgetFromTool.contains(tool), /**/);
+        QTC_CHECK(!m_controlsWidgetFromTool.contains(tool));
         m_controlsWidgetFromTool[tool] = widget;
         m_controlsStackWidget->addWidget(widget);
     }
@@ -677,7 +677,7 @@ void AnalyzerManagerPrivate::selectTool(IAnalyzerTool *tool, StartMode mode)
 
     loadToolSettings(tool);
 
-    QTC_ASSERT(m_controlsWidgetFromTool.contains(tool), /**/);
+    QTC_CHECK(m_controlsWidgetFromTool.contains(tool));
     m_controlsStackWidget->setCurrentWidget(m_controlsWidgetFromTool.value(tool));
     m_toolBox->setCurrentIndex(actionIndex);
 
diff --git a/src/plugins/coreplugin/mimedatabase.cpp b/src/plugins/coreplugin/mimedatabase.cpp
index 8a9679573e..b2b15ae8f2 100644
--- a/src/plugins/coreplugin/mimedatabase.cpp
+++ b/src/plugins/coreplugin/mimedatabase.cpp
@@ -565,7 +565,7 @@ MimeTypeData::MimeTypeData()
     // "*.log[1-9]"
     : suffixPattern(QLatin1String("^\\*\\.[\\w+]+$"))
 {
-    QTC_ASSERT(suffixPattern.isValid(), /**/);
+    QTC_CHECK(suffixPattern.isValid());
 }
 
 void MimeTypeData::clear()
diff --git a/src/plugins/coreplugin/scriptmanager/scriptmanager.cpp b/src/plugins/coreplugin/scriptmanager/scriptmanager.cpp
index eebcecb006..28a5d71479 100644
--- a/src/plugins/coreplugin/scriptmanager/scriptmanager.cpp
+++ b/src/plugins/coreplugin/scriptmanager/scriptmanager.cpp
@@ -165,7 +165,7 @@ static QScriptValue fileBox(QScriptContext *context, QScriptEngine *engine)
     if (fileDialog.exec() == QDialog::Rejected)
         return  QScriptValue(engine, QScriptValue::NullValue);
     const QStringList rc = fileDialog.selectedFiles();
-    QTC_ASSERT(!rc.empty(), /**/);
+    QTC_CHECK(!rc.empty());
     return TFileMode == QFileDialog::ExistingFiles ?
         engine->toScriptValue(rc) : engine->toScriptValue(rc.front());
 }
diff --git a/src/plugins/coreplugin/versiondialog.cpp b/src/plugins/coreplugin/versiondialog.cpp
index 681b5795f9..21e91fe23e 100644
--- a/src/plugins/coreplugin/versiondialog.cpp
+++ b/src/plugins/coreplugin/versiondialog.cpp
@@ -102,7 +102,7 @@ VersionDialog::VersionDialog(QWidget *parent)
 
     QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Close);
     QPushButton *closeButton = buttonBox->button(QDialogButtonBox::Close);
-    QTC_ASSERT(closeButton, /**/);
+    QTC_CHECK(closeButton);
     buttonBox->addButton(closeButton, QDialogButtonBox::ButtonRole(QDialogButtonBox::RejectRole | QDialogButtonBox::AcceptRole));
     connect(buttonBox , SIGNAL(rejected()), this, SLOT(reject()));
 
diff --git a/src/plugins/cppeditor/cppclasswizard.cpp b/src/plugins/cppeditor/cppclasswizard.cpp
index 5645d98441..fad5bcada4 100644
--- a/src/plugins/cppeditor/cppclasswizard.cpp
+++ b/src/plugins/cppeditor/cppclasswizard.cpp
@@ -232,7 +232,7 @@ bool CppClassWizard::generateHeaderAndSource(const CppClassWizardParameters &par
               << "\n#define " <<  guard << '\n';
 
     const QRegExp qtClassExpr(QLatin1String("^Q[A-Z3].+"));
-    QTC_ASSERT(qtClassExpr.isValid(), /**/);
+    QTC_CHECK(qtClassExpr.isValid());
     // Determine parent QObject type for Qt types. Provide base
     // class in case the user did not specify one.
     QString parentQObjectClass;
diff --git a/src/plugins/cvs/cvseditor.cpp b/src/plugins/cvs/cvseditor.cpp
index cd3778ccc4..947b351abc 100644
--- a/src/plugins/cvs/cvseditor.cpp
+++ b/src/plugins/cvs/cvseditor.cpp
@@ -127,7 +127,7 @@ cvs diff -d -u -r1.1 -r1.2:
 VCSBase::DiffHighlighter *CVSEditor::createDiffHighlighter() const
 {
     const QRegExp filePattern(QLatin1String("^[-+][-+][-+] .*1\\.[\\d\\.]+$"));
-    QTC_ASSERT(filePattern.isValid(), /**/);
+    QTC_CHECK(filePattern.isValid());
     return new VCSBase::DiffHighlighter(filePattern);
 }
 
diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp
index 9b2a2e899b..9d5255c3ff 100644
--- a/src/plugins/cvs/cvsplugin.cpp
+++ b/src/plugins/cvs/cvsplugin.cpp
@@ -634,7 +634,7 @@ CVSSubmitEditor *CVSPlugin::openCVSSubmitEditor(const QString &fileName)
     Core::IEditor *editor = Core::EditorManager::instance()->openEditor(fileName, QLatin1String(Constants::CVSCOMMITEDITOR_ID),
                                                                         Core::EditorManager::ModeSwitch);
     CVSSubmitEditor *submitEditor = qobject_cast<CVSSubmitEditor*>(editor);
-    QTC_ASSERT(submitEditor, /**/);
+    QTC_CHECK(submitEditor);
     submitEditor->registerActions(m_submitUndoAction, m_submitRedoAction, m_submitCurrentLogAction, m_submitDiffAction);
     connect(submitEditor, SIGNAL(diffSelectedFiles(QStringList)), this, SLOT(diffCommitFiles(QStringList)));
 
diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp
index 8e73a8fbfd..7d598454b5 100644
--- a/src/plugins/debugger/breakhandler.cpp
+++ b/src/plugins/debugger/breakhandler.cpp
@@ -461,7 +461,7 @@ QModelIndex BreakHandler::createIndex(int row, int column, quint32 id) const
 
 QModelIndex BreakHandler::createIndex(int row, int column, void *ptr) const
 {
-    QTC_ASSERT(false, /**/); // This function is not used.
+    QTC_CHECK(false); // This function is not used.
     return QAbstractItemModel::createIndex(row, column, ptr);
 }
 
diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp
index 799537c991..301407a20a 100644
--- a/src/plugins/debugger/debuggerengine.cpp
+++ b/src/plugins/debugger/debuggerengine.cpp
@@ -743,7 +743,7 @@ static bool isAllowedTransition(DebuggerState from, DebuggerState to)
 
 void DebuggerEngine::setupSlaveEngine()
 {
-    QTC_ASSERT(state() == DebuggerNotReady, /**/);
+    QTC_CHECK(state() == DebuggerNotReady);
     d->queueSetupEngine();
 }
 
@@ -776,7 +776,7 @@ void DebuggerEngine::notifyEngineSetupOk()
 
 void DebuggerEngine::setupSlaveInferior()
 {
-    QTC_ASSERT(state() == EngineSetupOk, /**/);
+    QTC_CHECK(state() == EngineSetupOk);
     d->queueSetupInferior();
 }
 
@@ -809,7 +809,7 @@ void DebuggerEngine::notifyInferiorSetupOk()
 void DebuggerEngine::runSlaveEngine()
 {
     QTC_ASSERT(isSlaveEngine(), return);
-    QTC_ASSERT(state() == InferiorSetupOk, /**/);
+    QTC_CHECK(state() == InferiorSetupOk);
     d->queueRunEngine();
 }
 
@@ -980,7 +980,7 @@ void DebuggerEngine::notifyInferiorIll()
 
 void DebuggerEngine::shutdownSlaveEngine()
 {
-    QTC_ASSERT(isAllowedTransition(state(),EngineShutdownRequested), /**/);
+    QTC_CHECK(isAllowedTransition(state(),EngineShutdownRequested));
     setState(EngineShutdownRequested);
     shutdownEngine();
 }
@@ -1329,7 +1329,7 @@ void DebuggerEngine::updateAll()
 #if 0
         // FIXME: Remove explicit use of BreakpointData
         if (!bp->engine && acceptsBreakpoint(id)) {
-            QTC_ASSERT(state == BreakpointNew, /**/);
+            QTC_CHECK(state == BreakpointNew);
             // Take ownership of the breakpoint.
             bp->engine = this;
         }
@@ -1355,7 +1355,7 @@ void DebuggerEngine::attemptBreakpointSynchronization()
         switch (handler->state(id)) {
         case BreakpointNew:
             // Should not happen once claimed.
-            QTC_ASSERT(false, /**/);
+            QTC_CHECK(false);
             continue;
         case BreakpointInsertRequested:
             done = false;
@@ -1381,7 +1381,7 @@ void DebuggerEngine::attemptBreakpointSynchronization()
             continue;
         case BreakpointDead:
             // Should not only be visible inside BreakpointHandler.
-            QTC_ASSERT(false, /**/);
+            QTC_CHECK(false);
             continue;
         }
         QTC_ASSERT(false, qDebug() << "UNKNOWN STATE"  << id << state());
@@ -1395,21 +1395,21 @@ void DebuggerEngine::insertBreakpoint(BreakpointModelId id)
 {
     BreakpointState state = breakHandler()->state(id);
     QTC_ASSERT(state == BreakpointInsertRequested, qDebug() << id << this << state);
-    QTC_ASSERT(false, /**/);
+    QTC_CHECK(false);
 }
 
 void DebuggerEngine::removeBreakpoint(BreakpointModelId id)
 {
     BreakpointState state = breakHandler()->state(id);
     QTC_ASSERT(state == BreakpointRemoveRequested, qDebug() << id << this << state);
-    QTC_ASSERT(false, /**/);
+    QTC_CHECK(false);
 }
 
 void DebuggerEngine::changeBreakpoint(BreakpointModelId id)
 {
     BreakpointState state = breakHandler()->state(id);
     QTC_ASSERT(state == BreakpointChangeRequested, qDebug() << id << this << state);
-    QTC_ASSERT(false, /**/);
+    QTC_CHECK(false);
 }
 
 void DebuggerEngine::selectThread(int)
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index eecb627eca..b892db28ed 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -1113,7 +1113,7 @@ DebuggerPluginPrivate::DebuggerPluginPrivate(DebuggerPlugin *plugin) :
     qRegisterMetaType<ContextData>("ContextData");
     qRegisterMetaType<DebuggerStartParameters>("DebuggerStartParameters");
 
-    QTC_ASSERT(!theDebuggerCore, /**/);
+    QTC_CHECK(!theDebuggerCore);
     theDebuggerCore = this;
 
     m_plugin = plugin;
@@ -1350,7 +1350,7 @@ void DebuggerPluginPrivate::onCurrentProjectChanged(Project *project)
         Target *target = project->activeTarget();
         QTC_ASSERT(target, return);
         activeRc = target->activeRunConfiguration();
-        QTC_ASSERT(activeRc, /**/);
+        QTC_CHECK(activeRc);
     }
     for (int i = 0, n = m_snapshotHandler->size(); i != n; ++i) {
         // Run controls might be deleted during exit.
@@ -3148,7 +3148,7 @@ void DebuggerPluginPrivate::extensionsInitialized()
         SIGNAL(startupProjectChanged(ProjectExplorer::Project*)),
         SLOT(onCurrentProjectChanged(ProjectExplorer::Project*)));
 
-    QTC_ASSERT(m_coreSettings, /**/);
+    QTC_CHECK(m_coreSettings);
     m_globalDebuggerOptions->fromSettings(m_coreSettings);
     m_watchersWindow->setVisible(false);
     m_returnWindow->setVisible(false);
diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp
index 0262e0f3a5..3241396639 100644
--- a/src/plugins/debugger/debuggerrunner.cpp
+++ b/src/plugins/debugger/debuggerrunner.cpp
@@ -345,7 +345,7 @@ bool DebuggerRunControl::isRunning() const
 
 DebuggerEngine *DebuggerRunControl::engine()
 {
-    QTC_ASSERT(d->m_engine, /**/);
+    QTC_CHECK(d->m_engine);
     return d->m_engine;
 }
 
diff --git a/src/plugins/debugger/gdb/abstractplaingdbadapter.cpp b/src/plugins/debugger/gdb/abstractplaingdbadapter.cpp
index 6fe2477253..2481b78770 100644
--- a/src/plugins/debugger/gdb/abstractplaingdbadapter.cpp
+++ b/src/plugins/debugger/gdb/abstractplaingdbadapter.cpp
@@ -107,7 +107,7 @@ void AbstractPlainGdbAdapter::handleExecRun(const GdbResponse &response)
             m_engine->postCommand("target record");
     } else {
         QString msg = fromLocalEncoding(response.data.findChild("msg").data());
-        //QTC_ASSERT(status() == InferiorRunOk, /**/);
+        //QTC_CHECK(status() == InferiorRunOk);
         //interruptInferior();
         showMessage(msg);
         m_engine->notifyEngineRunFailed();
diff --git a/src/plugins/debugger/gdb/classicgdbengine.cpp b/src/plugins/debugger/gdb/classicgdbengine.cpp
index 42f364f0f2..1cdeac8935 100644
--- a/src/plugins/debugger/gdb/classicgdbengine.cpp
+++ b/src/plugins/debugger/gdb/classicgdbengine.cpp
@@ -55,7 +55,7 @@
 #endif
 
 
-#define PRECONDITION QTC_ASSERT(!hasPython(), /**/)
+#define PRECONDITION QTC_CHECK(!hasPython())
 
 #define CB(callback) &GdbEngine::callback, STRINGIFY(callback)
 
@@ -543,7 +543,7 @@ void DumperHelper::evaluationParameters(const WatchData &data,
             // iname="local.ob.slots.2" // ".deleteLater()"?
             const int pos = data.iname.lastIndexOf('.');
             const QByteArray slotNumber = data.iname.mid(pos + 1);
-            QTC_ASSERT(slotNumber.toInt() != -1, /**/);
+            QTC_CHECK(slotNumber.toInt() != -1);
             extraArgs[0] = slotNumber;
         }
         break;
@@ -1111,7 +1111,7 @@ void GdbEngine::tryLoadDebuggingHelpersClassic()
     // Do not use STRINGIFY for RTLD_NOW as we really want to expand that to a number.
 #if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
     // We are using Python on Windows and Symbian.
-    QTC_ASSERT(false, /**/);
+    QTC_CHECK(false);
 #elif defined(Q_OS_MAC)
     //postCommand("sharedlibrary libc"); // for malloc
     //postCommand("sharedlibrary libdl"); // for dlopen
diff --git a/src/plugins/debugger/gdb/codagdbadapter.cpp b/src/plugins/debugger/gdb/codagdbadapter.cpp
index 7ac0c704cd..d28dda19f9 100644
--- a/src/plugins/debugger/gdb/codagdbadapter.cpp
+++ b/src/plugins/debugger/gdb/codagdbadapter.cpp
@@ -417,7 +417,7 @@ void CodaGdbAdapter::logMessage(const QString &msg, int channel)
 void CodaGdbAdapter::handleGdbConnection()
 {
     logMessage("HANDLING GDB CONNECTION");
-    QTC_ASSERT(m_gdbConnection == 0, /**/);
+    QTC_CHECK(m_gdbConnection == 0);
     m_gdbConnection = m_gdbServer->nextPendingConnection();
     QTC_ASSERT(m_gdbConnection, return);
     connect(m_gdbConnection, SIGNAL(disconnected()),
@@ -1550,7 +1550,7 @@ void CodaGdbAdapter::tryAnswerGdbMemoryRequest(bool buffered)
             }
         }
         // Happens when chunks are not combined
-        QTC_ASSERT(false, /**/);
+        QTC_CHECK(false);
         showMessage("CHUNKS NOT COMBINED");
 #        ifdef MEMORY_DEBUG
         qDebug() << "CHUNKS NOT COMBINED";
diff --git a/src/plugins/debugger/gdb/coregdbadapter.cpp b/src/plugins/debugger/gdb/coregdbadapter.cpp
index 6b80ce102c..333fe7c68c 100644
--- a/src/plugins/debugger/gdb/coregdbadapter.cpp
+++ b/src/plugins/debugger/gdb/coregdbadapter.cpp
@@ -239,7 +239,7 @@ void CoreGdbAdapter::runEngine()
 void CoreGdbAdapter::interruptInferior()
 {
     // A core never runs, so this cannot be called.
-    QTC_ASSERT(false, /**/);
+    QTC_CHECK(false);
 }
 
 void CoreGdbAdapter::shutdownInferior()
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 1400e75e86..64dd09c529 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -1023,7 +1023,7 @@ void GdbEngine::handleResultRecord(GdbResponse *response)
                 showMessage(_("APPLYING WORKAROUND #5"));
                 showMessageBox(QMessageBox::Critical,
                     tr("Setting breakpoints failed"), QString::fromLocal8Bit(msg));
-                QTC_ASSERT(state() == InferiorRunOk, /**/);
+                QTC_CHECK(state() == InferiorRunOk);
                 notifyInferiorSpontaneousStop();
                 notifyEngineIll();
             } else {
@@ -1147,7 +1147,7 @@ bool GdbEngine::acceptsDebuggerCommands() const
 
 void GdbEngine::executeDebuggerCommand(const QString &command)
 {
-    QTC_ASSERT(acceptsDebuggerCommands(), /**/);
+    QTC_CHECK(acceptsDebuggerCommands());
     m_gdbAdapter->write(command.toLatin1() + "\r\n");
 }
 
@@ -1337,7 +1337,7 @@ void GdbEngine::handleStopResponse(const GdbMi &data)
         notifyInferiorStopOk();
         flushQueuedCommands();
         if (state() == InferiorStopOk) {
-            QTC_ASSERT(m_commandsDoneCallback == 0, /**/);
+            QTC_CHECK(m_commandsDoneCallback == 0);
             m_commandsDoneCallback = &GdbEngine::autoContinueInferior;
         } else {
             QTC_ASSERT(state() == InferiorShutdownRequested, qDebug() << state())
@@ -1969,7 +1969,7 @@ AbstractGdbAdapter *GdbEngine::createAdapter()
 void GdbEngine::setupEngine()
 {
     QTC_ASSERT(state() == EngineSetupRequested, qDebug() << state());
-    QTC_ASSERT(m_debuggingHelperState == DebuggingHelperUninitialized, /**/);
+    QTC_CHECK(m_debuggingHelperState == DebuggingHelperUninitialized);
 
     if (m_gdbAdapter->dumperHandling() != AbstractGdbAdapter::DumperNotAvailable) {
         connect(debuggerCore()->action(UseDebuggingHelpers),
@@ -1977,7 +1977,7 @@ void GdbEngine::setupEngine()
             SLOT(setUseDebuggingHelpers(QVariant)));
     }
 
-    QTC_ASSERT(state() == EngineSetupRequested, /**/);
+    QTC_CHECK(state() == EngineSetupRequested);
     m_gdbAdapter->startAdapter();
 }
 
@@ -2068,7 +2068,7 @@ void GdbEngine::handleExecuteStep(const GdbResponse &response)
     if (response.resultClass == GdbResultDone) {
         // Step was finishing too quick, and a '*stopped' messages should
         // have preceded it, so just ignore this result.
-        QTC_ASSERT(state() == InferiorStopOk, /**/);
+        QTC_CHECK(state() == InferiorStopOk);
         return;
     }
     QTC_ASSERT(state() == InferiorRunRequested, qDebug() << state());
@@ -2138,7 +2138,7 @@ void GdbEngine::handleExecuteNext(const GdbResponse &response)
     if (response.resultClass == GdbResultDone) {
         // Step was finishing too quick, and a '*stopped' messages should
         // have preceded it, so just ignore this result.
-        QTC_ASSERT(state() == InferiorStopOk, /**/);
+        QTC_CHECK(state() == InferiorStopOk);
         return;
     }
     QTC_ASSERT(state() == InferiorRunRequested, qDebug() << state());
@@ -2447,7 +2447,7 @@ void GdbEngine::handleWatchInsert(const GdbResponse &response)
             if (exp.startsWith('*'))
                 br.address = exp.mid(1).toULongLong(0, 0);
             handler->setResponse(id, br);
-            QTC_ASSERT(!handler->needsChange(id), /**/);
+            QTC_CHECK(!handler->needsChange(id));
             handler->notifyBreakpointInsertOk(id);
         } else if (ba.startsWith("Hardware watchpoint ")
                 || ba.startsWith("Watchpoint ")) {
@@ -2459,7 +2459,7 @@ void GdbEngine::handleWatchInsert(const GdbResponse &response)
             if (address.startsWith('*'))
                 br.address = address.mid(1).toULongLong(0, 0);
             handler->setResponse(id, br);
-            QTC_ASSERT(!handler->needsChange(id), /**/);
+            QTC_CHECK(!handler->needsChange(id));
             handler->notifyBreakpointInsertOk(id);
         } else {
             showMessage(_("CANNOT PARSE WATCHPOINT FROM " + ba));
@@ -2658,7 +2658,7 @@ void GdbEngine::handleBreakList(const GdbMi &table)
 
 void GdbEngine::handleBreakListMultiple(const GdbResponse &response)
 {
-    QTC_ASSERT(response.resultClass == GdbResultDone, /**/)
+    QTC_CHECK(response.resultClass == GdbResultDone)
     const BreakpointModelId id = response.cookie.value<BreakpointModelId>();
     const QString str = QString::fromLocal8Bit(response.consoleStreamOutput);
     extractDataFromInfoBreak(str, id);
@@ -2666,7 +2666,7 @@ void GdbEngine::handleBreakListMultiple(const GdbResponse &response)
 
 void GdbEngine::handleBreakDisable(const GdbResponse &response)
 {
-    QTC_ASSERT(response.resultClass == GdbResultDone, /**/)
+    QTC_CHECK(response.resultClass == GdbResultDone)
     const BreakpointModelId id = response.cookie.value<BreakpointModelId>();
     BreakHandler *handler = breakHandler();
     // This should only be the requested state.
@@ -2679,7 +2679,7 @@ void GdbEngine::handleBreakDisable(const GdbResponse &response)
 
 void GdbEngine::handleBreakEnable(const GdbResponse &response)
 {
-    QTC_ASSERT(response.resultClass == GdbResultDone, /**/)
+    QTC_CHECK(response.resultClass == GdbResultDone)
     const BreakpointModelId id = response.cookie.value<BreakpointModelId>();
     BreakHandler *handler = breakHandler();
     // This should only be the requested state.
@@ -2692,7 +2692,7 @@ void GdbEngine::handleBreakEnable(const GdbResponse &response)
 
 void GdbEngine::handleBreakThreadSpec(const GdbResponse &response)
 {
-    QTC_ASSERT(response.resultClass == GdbResultDone, /**/)
+    QTC_CHECK(response.resultClass == GdbResultDone)
     const BreakpointModelId id = response.cookie.value<BreakpointModelId>();
     BreakHandler *handler = breakHandler();
     BreakpointResponse br = handler->response(id);
@@ -2714,7 +2714,7 @@ void GdbEngine::handleBreakIgnore(const GdbResponse &response)
     // 29^done
     //
     // gdb 6.3 does not produce any console output
-    QTC_ASSERT(response.resultClass == GdbResultDone, /**/)
+    QTC_CHECK(response.resultClass == GdbResultDone)
     //QString msg = _(response.consoleStreamOutput);
     BreakpointModelId id = response.cookie.value<BreakpointModelId>();
     BreakHandler *handler = breakHandler();
@@ -2734,7 +2734,7 @@ void GdbEngine::handleBreakIgnore(const GdbResponse &response)
 void GdbEngine::handleBreakCondition(const GdbResponse &response)
 {
     // Can happen at invalid condition strings.
-    //QTC_ASSERT(response.resultClass == GdbResultDone, /**/)
+    //QTC_CHECK(response.resultClass == GdbResultDone)
     const BreakpointModelId id = response.cookie.value<BreakpointModelId>();
     BreakHandler *handler = breakHandler();
     // We just assume it was successful. Otherwise we had to parse
@@ -2923,7 +2923,7 @@ void GdbEngine::insertBreakpoint(BreakpointModelId id)
     // Set up fallback in case of pending breakpoints which aren't handled
     // by the MI interface.
     BreakHandler *handler = breakHandler();
-    QTC_ASSERT(handler->state(id) == BreakpointInsertRequested, /**/);
+    QTC_CHECK(handler->state(id) == BreakpointInsertRequested);
     handler->notifyBreakpointInsertProceeding(id);
     BreakpointType type = handler->type(id);
     QVariant vid = QVariant::fromValue(id);
@@ -3054,7 +3054,7 @@ void GdbEngine::changeBreakpoint(BreakpointModelId id)
 void GdbEngine::removeBreakpoint(BreakpointModelId id)
 {
     BreakHandler *handler = breakHandler();
-    QTC_ASSERT(handler->state(id) == BreakpointRemoveRequested, /**/);
+    QTC_CHECK(handler->state(id) == BreakpointRemoveRequested);
     handler->notifyBreakpointRemoveProceeding(id);
     BreakpointResponse br = handler->response(id);
     showMessage(_("DELETING BP %1 IN %2").arg(br.id.toString())
@@ -3298,7 +3298,7 @@ void GdbEngine::reloadSourceFiles()
 
 void GdbEngine::reloadSourceFilesInternal()
 {
-    QTC_ASSERT(!m_sourcesListUpdating, /**/);
+    QTC_CHECK(!m_sourcesListUpdating);
     m_sourcesListUpdating = true;
     postCommand("-file-list-exec-source-files", NeedsStop, CB(handleQuerySources));
 #if 0
@@ -3328,7 +3328,7 @@ void GdbEngine::selectThread(int index)
 
 void GdbEngine::handleStackSelectThread(const GdbResponse &)
 {
-    QTC_ASSERT(state() == InferiorUnrunnable || state() == InferiorStopOk, /**/);
+    QTC_CHECK(state() == InferiorUnrunnable || state() == InferiorStopOk);
     showStatusMessage(tr("Retrieving data for stack view..."), 3000);
     reloadStack(true); // Will reload registers.
     updateLocals();
@@ -4871,7 +4871,7 @@ void GdbEngine::handleInferiorPrepared()
     if (m_cookieForToken.isEmpty()) {
         finishInferiorSetup();
     } else {
-        QTC_ASSERT(m_commandsDoneCallback == 0, /**/);
+        QTC_CHECK(m_commandsDoneCallback == 0);
         m_commandsDoneCallback = &GdbEngine::finishInferiorSetup;
     }
 }
diff --git a/src/plugins/debugger/gdb/gdbmi.cpp b/src/plugins/debugger/gdb/gdbmi.cpp
index 080916037a..c4745f9370 100644
--- a/src/plugins/debugger/gdb/gdbmi.cpp
+++ b/src/plugins/debugger/gdb/gdbmi.cpp
@@ -183,7 +183,7 @@ void GdbMi::parseValue(const char *&from, const char *to)
 void GdbMi::parseTuple(const char *&from, const char *to)
 {
     //qDebug() << "parseTuple: " << QByteArray(from, to - from);
-    QTC_ASSERT(*from == '{', /**/);
+    QTC_CHECK(*from == '{');
     ++from;
     parseTuple_helper(from, to);
 }
@@ -211,7 +211,7 @@ void GdbMi::parseTuple_helper(const char *&from, const char *to)
 void GdbMi::parseList(const char *&from, const char *to)
 {
     //qDebug() << "parseList: " << QByteArray(from, to - from);
-    QTC_ASSERT(*from == '[', /**/);
+    QTC_CHECK(*from == '[');
     ++from;
     m_type = List;
     skipCommas(from, to);
diff --git a/src/plugins/debugger/gdb/pythongdbengine.cpp b/src/plugins/debugger/gdb/pythongdbengine.cpp
index 81d5ca302b..e4e9a61a76 100644
--- a/src/plugins/debugger/gdb/pythongdbengine.cpp
+++ b/src/plugins/debugger/gdb/pythongdbengine.cpp
@@ -44,7 +44,7 @@
 
 #include <utils/qtcassert.h>
 
-#define PRECONDITION QTC_ASSERT(hasPython(), /**/)
+#define PRECONDITION QTC_CHECK(hasPython())
 #define CB(callback) &GdbEngine::callback, STRINGIFY(callback)
 
 
@@ -200,7 +200,7 @@ void GdbEngine::updateAllPython()
 {
     PRECONDITION;
     //PENDING_DEBUG("UPDATING ALL\n");
-    QTC_ASSERT(state() == InferiorUnrunnable || state() == InferiorStopOk, /**/);
+    QTC_CHECK(state() == InferiorUnrunnable || state() == InferiorStopOk);
     reloadModulesInternal();
     postCommand("-stack-list-frames", CB(handleStackListFrames),
         QVariant::fromValue<StackCookie>(StackCookie(false, true)));
diff --git a/src/plugins/debugger/gdb/symbian.cpp b/src/plugins/debugger/gdb/symbian.cpp
index a3cf5f67df..91c94a024a 100644
--- a/src/plugins/debugger/gdb/symbian.cpp
+++ b/src/plugins/debugger/gdb/symbian.cpp
@@ -59,7 +59,7 @@ MemoryRange::MemoryRange(uint f, uint t)
 bool MemoryRange::intersects(const MemoryRange &other) const
 {
     Q_UNUSED(other);
-    QTC_ASSERT(false, /**/);
+    QTC_CHECK(false);
     return false; // FIXME
 }
 
diff --git a/src/plugins/debugger/memoryagent.cpp b/src/plugins/debugger/memoryagent.cpp
index a8fbcc8a82..1ebbf162a1 100644
--- a/src/plugins/debugger/memoryagent.cpp
+++ b/src/plugins/debugger/memoryagent.cpp
@@ -93,7 +93,7 @@ namespace { const int DataRange = 1024 * 1024; }
 MemoryAgent::MemoryAgent(DebuggerEngine *engine)
     : QObject(engine), m_engine(engine)
 {
-    QTC_ASSERT(engine, /**/);
+    QTC_CHECK(engine);
     connect(engine, SIGNAL(stateChanged(Debugger::DebuggerState)),
             this, SLOT(engineStateChanged(Debugger::DebuggerState)));
     connect(engine, SIGNAL(stackFrameCompleted()), this,
diff --git a/src/plugins/debugger/pdb/pdbengine.cpp b/src/plugins/debugger/pdb/pdbengine.cpp
index c3cbf0d024..a8334f96bb 100644
--- a/src/plugins/debugger/pdb/pdbengine.cpp
+++ b/src/plugins/debugger/pdb/pdbengine.cpp
@@ -338,7 +338,7 @@ bool PdbEngine::acceptsBreakpoint(BreakpointModelId id) const
 void PdbEngine::insertBreakpoint(BreakpointModelId id)
 {
     BreakHandler *handler = breakHandler();
-    QTC_ASSERT(handler->state(id) == BreakpointInsertRequested, /**/);
+    QTC_CHECK(handler->state(id) == BreakpointInsertRequested);
     handler->notifyBreakpointInsertProceeding(id);
 
     QByteArray loc;
@@ -374,7 +374,7 @@ void PdbEngine::handleBreakInsert(const PdbResponse &response)
 void PdbEngine::removeBreakpoint(BreakpointModelId id)
 {
     BreakHandler *handler = breakHandler();
-    QTC_ASSERT(handler->state(id) == BreakpointRemoveRequested, /**/);
+    QTC_CHECK(handler->state(id) == BreakpointRemoveRequested);
     handler->notifyBreakpointRemoveProceeding(id);
     BreakpointResponse br = handler->response(id);
     showMessage(_("DELETING BP %1 IN %2").arg(br.id.toString())
diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp
index f0e396bde0..a05a7fd35f 100644
--- a/src/plugins/debugger/qml/qmlcppengine.cpp
+++ b/src/plugins/debugger/qml/qmlcppengine.cpp
@@ -317,7 +317,7 @@ void QmlCppEngine::detachDebugger()
 void QmlCppEngine::executeStep()
 {
     if (d->m_activeEngine == d->m_qmlEngine) {
-        QTC_ASSERT(d->m_cppEngine->state() == InferiorRunOk, /**/);
+        QTC_CHECK(d->m_cppEngine->state() == InferiorRunOk);
         if (d->m_cppEngine->setupQmlStep(true))
             return; // Wait for callback to readyToExecuteQmlStep()
     } else {
diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp
index d9bb6bbf0b..c3fd345bc0 100644
--- a/src/plugins/debugger/qml/qmlengine.cpp
+++ b/src/plugins/debugger/qml/qmlengine.cpp
@@ -883,7 +883,7 @@ void QmlEngine::messageReceived(const QByteArray &message)
             foreach (BreakpointModelId id, handler->engineBreakpointIds(this)) {
                 QString processedFilename = handler->fileName(id);
                 if (processedFilename == file && handler->lineNumber(id) == line) {
-                    QTC_ASSERT(handler->state(id) == BreakpointInserted,/**/);
+                    QTC_CHECK(handler->state(id) == BreakpointInserted);
                     BreakpointResponse br = handler->response(id);
                     br.fileName = file;
                     br.lineNumber = line;
diff --git a/src/plugins/debugger/script/scriptengine.cpp b/src/plugins/debugger/script/scriptengine.cpp
index 7a3c972907..749b18c67c 100644
--- a/src/plugins/debugger/script/scriptengine.cpp
+++ b/src/plugins/debugger/script/scriptengine.cpp
@@ -246,7 +246,7 @@ void ScriptEngine::setupEngine()
     showMessage(_("STARTING SCRIPT DEBUGGER"), LogMisc);
     if (m_scriptEngine.isNull())
         m_scriptEngine = Core::ICore::instance()->scriptManager()->scriptEngine();
-    QTC_ASSERT(!m_scriptAgent, /**/);
+    QTC_CHECK(!m_scriptAgent);
     m_scriptAgent.reset(new ScriptAgent(this, m_scriptEngine.data()));
     m_scriptEngine->setAgent(m_scriptAgent.data());
     //m_scriptEngine->setAgent(new ScriptAgent(this, m_scriptEngine.data()));
diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp
index f489531789..610086d552 100644
--- a/src/plugins/debugger/watchhandler.cpp
+++ b/src/plugins/debugger/watchhandler.cpp
@@ -812,7 +812,7 @@ bool WatchModel::setData(const QModelIndex &index, const QVariant &value, int ro
         case LocalsExpandedRole:
             if (value.toBool()) {
                 // Should already have been triggered by fetchMore()
-                //QTC_ASSERT(m_handler->m_expandedINames.contains(data.iname), /**/);
+                //QTC_CHECK(m_handler->m_expandedINames.contains(data.iname));
                 m_handler->m_expandedINames.insert(data.iname);
             } else {
                 m_handler->m_expandedINames.remove(data.iname);
@@ -1550,7 +1550,7 @@ WatchModel *WatchHandler::model(WatchType type) const
         case WatchersWatch: return m_watchers;
         case TooltipsWatch: return m_tooltips;
     }
-    QTC_ASSERT(false, /**/);
+    QTC_CHECK(false);
     return 0;
 }
 
diff --git a/src/plugins/fakevim/fakevimhandler.cpp b/src/plugins/fakevim/fakevimhandler.cpp
index 9d6eb066ee..b75737dbb5 100644
--- a/src/plugins/fakevim/fakevimhandler.cpp
+++ b/src/plugins/fakevim/fakevimhandler.cpp
@@ -1234,7 +1234,7 @@ void FakeVimHandler::Private::exportSelection()
         } else if (m_visualMode == VisualCharMode) {
             /* Nothing */
         } else {
-            QTC_ASSERT(false, /**/);
+            QTC_CHECK(false);
         }
     } else {
         setAnchorAndPosition(pos, pos);
@@ -1644,7 +1644,7 @@ void FakeVimHandler::Private::updateMiniBuffer()
         if (!msg.isEmpty() && m_mode != CommandMode)
             msg += QChar(10073); // '|'; // FIXME: Use a real "cursor"
     } else {
-        QTC_ASSERT(m_mode == CommandMode && m_subsubmode != SearchSubSubMode, /**/);
+        QTC_CHECK(m_mode == CommandMode && m_subsubmode != SearchSubSubMode);
         msg = "-- COMMAND --";
     }
 
@@ -3368,7 +3368,7 @@ bool FakeVimHandler::Private::handleExSetCommand(const ExCommand &cmd)
 
     showBlackMessage(QString());
     SavedAction *act = theFakeVimSettings()->item(cmd.args);
-    QTC_ASSERT(!cmd.args.isEmpty(), /**/); // Handled by plugin.
+    QTC_CHECK(!cmd.args.isEmpty()); // Handled by plugin.
     if (act && act->value().type() == QVariant::Bool) {
         // Boolean config to be switched on.
         bool oldValue = act->value().toBool();
@@ -4255,7 +4255,7 @@ void FakeVimHandler::Private::scrollToLine(int line)
     QScrollBar *scrollBar = EDITOR(verticalScrollBar());
     //qDebug() << "SCROLL: " << scrollBar->value() << line;
     scrollBar->setValue(line);
-    //QTC_ASSERT(firstVisibleLine() == line, /**/);
+    //QTC_CHECK(firstVisibleLine() == line);
 }
 
 int FakeVimHandler::Private::firstVisibleLine() const
diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp
index 9daa4cdf11..ba647f9f7b 100644
--- a/src/plugins/genericprojectmanager/genericproject.cpp
+++ b/src/plugins/genericprojectmanager/genericproject.cpp
@@ -625,7 +625,7 @@ void GenericProjectFile::rename(const QString &newName)
 {
     // Can't happen
     Q_UNUSED(newName);
-    QTC_ASSERT(false, /**/);
+    QTC_CHECK(false);
 }
 
 Core::IFile::ReloadBehavior GenericProjectFile::reloadBehavior(ChangeTrigger state, ChangeType type) const
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index e7f4807d4b..1bd5f363c7 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -1441,7 +1441,7 @@ GitCommand *GitClient::createCommand(const QString &workingDirectory,
             connect(command, SIGNAL(outputData(QByteArray)), outputWindow, SLOT(appendData(QByteArray)));
         }
     } else {
-        QTC_ASSERT(editor, /**/);
+        QTC_CHECK(editor);
         connect(command, SIGNAL(outputData(QByteArray)), editor, SLOT(setPlainTextDataFiltered(QByteArray)));
     }
 
diff --git a/src/plugins/glsleditor/glsleditorplugin.cpp b/src/plugins/glsleditor/glsleditorplugin.cpp
index 319982888a..76e082ad0e 100644
--- a/src/plugins/glsleditor/glsleditorplugin.cpp
+++ b/src/plugins/glsleditor/glsleditorplugin.cpp
@@ -235,7 +235,7 @@ ExtensionSystem::IPlugin::ShutdownFlag GLSLEditorPlugin::aboutToShutdown()
 
 void GLSLEditorPlugin::initializeEditor(GLSLEditor::GLSLTextEditorWidget *editor)
 {
-    QTC_ASSERT(m_instance, /**/);
+    QTC_CHECK(m_instance);
 
     m_actionHandler->setupActions(editor);
 
diff --git a/src/plugins/perforce/perforceeditor.cpp b/src/plugins/perforce/perforceeditor.cpp
index e1b4b297a1..8cc2695e08 100644
--- a/src/plugins/perforce/perforceeditor.cpp
+++ b/src/plugins/perforce/perforceeditor.cpp
@@ -65,7 +65,7 @@ PerforceEditor::PerforceEditor(const VCSBase::VCSBaseEditorParameters *type,
     m_changeNumberPattern(QLatin1String("^\\d+$")),
     m_plugin(PerforcePlugin::perforcePluginInstance())
 {
-    QTC_ASSERT(m_changeNumberPattern.isValid(), /**/);
+    QTC_CHECK(m_changeNumberPattern.isValid());
     setAnnotateRevisionTextFormat(tr("Annotate change list \"%1\""));
     if (Perforce::Constants::debug)
         qDebug() << "PerforceEditor::PerforceEditor" << type->type << type->id;
diff --git a/src/plugins/perforce/perforcesubmiteditor.cpp b/src/plugins/perforce/perforcesubmiteditor.cpp
index 163bd50e76..591de249e2 100644
--- a/src/plugins/perforce/perforcesubmiteditor.cpp
+++ b/src/plugins/perforce/perforcesubmiteditor.cpp
@@ -133,7 +133,7 @@ void PerforceSubmitEditor::updateFields()
     lines.removeLast(); // that is the empty line at the end
 
     const QRegExp leadingTabPattern = QRegExp(QLatin1String("^\\t"));
-    QTC_ASSERT(leadingTabPattern.isValid(), /**/);
+    QTC_CHECK(leadingTabPattern.isValid());
 
     lines.replaceInStrings(leadingTabPattern, QString());
     widget->setDescriptionText(lines.join(newLine));
diff --git a/src/plugins/qmljseditor/qmljseditorplugin.cpp b/src/plugins/qmljseditor/qmljseditorplugin.cpp
index 10164bae0a..bc6ab10315 100644
--- a/src/plugins/qmljseditor/qmljseditorplugin.cpp
+++ b/src/plugins/qmljseditor/qmljseditorplugin.cpp
@@ -258,7 +258,7 @@ ExtensionSystem::IPlugin::ShutdownFlag QmlJSEditorPlugin::aboutToShutdown()
 
 void QmlJSEditorPlugin::initializeEditor(QmlJSEditor::QmlJSTextEditorWidget *editor)
 {
-    QTC_ASSERT(m_instance, /**/);
+    QTC_CHECK(m_instance);
 
     m_actionHandler->setupActions(editor);
 
diff --git a/src/plugins/qmlprofiler/qmlprofilerengine.cpp b/src/plugins/qmlprofiler/qmlprofilerengine.cpp
index 18b9f2669f..402f32c70a 100644
--- a/src/plugins/qmlprofiler/qmlprofilerengine.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerengine.cpp
@@ -117,7 +117,7 @@ QmlProfilerEngine::QmlProfilerEnginePrivate::createRunner(ProjectExplorer::RunCo
             qobject_cast<RemoteLinux::RemoteLinuxRunConfiguration *>(runConfiguration)) {
         runner = new RemoteLinuxQmlProfilerRunner(rmConfig, parent);
     } else {
-        QTC_ASSERT(false, /**/);
+        QTC_CHECK(false);
     }
     return runner;
 }
diff --git a/src/plugins/remotelinux/maemoqemuruntimeparser.cpp b/src/plugins/remotelinux/maemoqemuruntimeparser.cpp
index 1b3620ac40..ff9c7c8c8d 100644
--- a/src/plugins/remotelinux/maemoqemuruntimeparser.cpp
+++ b/src/plugins/remotelinux/maemoqemuruntimeparser.cpp
@@ -423,7 +423,7 @@ MaemoQemuSettings::OpenGlMode MaemoQemuRuntimeParserV2::openGlTagToEnum(const QS
         return MaemoQemuSettings::SoftwareRendering;
     if (tag == QLatin1String("autodetect"))
         return MaemoQemuSettings::AutoDetect;
-    QTC_ASSERT(false, /**/);
+    QTC_CHECK(false);
     return MaemoQemuSettings::AutoDetect;
 }
 
diff --git a/src/plugins/subversion/subversioneditor.cpp b/src/plugins/subversion/subversioneditor.cpp
index f978e9035c..20df020468 100644
--- a/src/plugins/subversion/subversioneditor.cpp
+++ b/src/plugins/subversion/subversioneditor.cpp
@@ -113,7 +113,7 @@ QString SubversionEditor::changeUnderCursor(const QTextCursor &c) const
 VCSBase::DiffHighlighter *SubversionEditor::createDiffHighlighter() const
 {
     const QRegExp filePattern(QLatin1String("^[-+][-+][-+] .*|^Index: .*|^==*$"));
-    QTC_ASSERT(filePattern.isValid(), /**/);
+    QTC_CHECK(filePattern.isValid());
     return new VCSBase::DiffHighlighter(filePattern);
 }
 
diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp
index de9b301fb6..c4b72d3cc3 100644
--- a/src/plugins/subversion/subversionplugin.cpp
+++ b/src/plugins/subversion/subversionplugin.cpp
@@ -640,7 +640,7 @@ SubversionSubmitEditor *SubversionPlugin::openSubversionSubmitEditor(const QStri
                                                                         QLatin1String(Constants::SUBVERSIONCOMMITEDITOR_ID),
                                                                         Core::EditorManager::ModeSwitch);
     SubversionSubmitEditor *submitEditor = qobject_cast<SubversionSubmitEditor*>(editor);
-    QTC_ASSERT(submitEditor, /**/);
+    QTC_CHECK(submitEditor);
     submitEditor->registerActions(m_submitUndoAction, m_submitRedoAction, m_submitCurrentLogAction, m_submitDiffAction);
     connect(submitEditor, SIGNAL(diffSelectedFiles(QStringList)), this, SLOT(diffCommitFiles(QStringList)));
     submitEditor->setCheckScriptWorkingDirectory(m_commitRepository);
diff --git a/src/plugins/vcsbase/diffhighlighter.cpp b/src/plugins/vcsbase/diffhighlighter.cpp
index 06560d53ed..d94458fb34 100644
--- a/src/plugins/vcsbase/diffhighlighter.cpp
+++ b/src/plugins/vcsbase/diffhighlighter.cpp
@@ -110,7 +110,7 @@ DiffHighlighterPrivate::DiffHighlighterPrivate(const QRegExp &filePattern) :
     m_diffOutIndicator(QLatin1Char('-')),
     m_foldingState(StartOfFile)
 {
-    QTC_ASSERT(filePattern.isValid(), /**/);
+    QTC_CHECK(filePattern.isValid());
 }
 
 DiffFormats DiffHighlighterPrivate::analyzeLine(const QString &text) const
diff --git a/src/shared/symbianutils/json.cpp b/src/shared/symbianutils/json.cpp
index 699ba02d0a..7ac1c8c2c6 100644
--- a/src/shared/symbianutils/json.cpp
+++ b/src/shared/symbianutils/json.cpp
@@ -240,7 +240,7 @@ void JsonValue::parseObject(const char *&from, const char *to)
 {
     JDEBUG("parseObject: " << QByteArray(from, to - from));
 #ifdef TODO_USE_CREATOR
-    QTC_ASSERT(*from == '{', /**/);
+    QTC_CHECK(*from == '{');
 #endif
     ++from;
     m_type = Object;
@@ -263,7 +263,7 @@ void JsonValue::parseArray(const char *&from, const char *to)
 {
     JDEBUG("parseArray: " << QByteArray(from, to - from));
 #ifdef TODO_USE_CREATOR
-    QTC_ASSERT(*from == '[', /**/);
+    QTC_CHECK(*from == '[');
 #endif
     ++from;
     m_type = Array;