replace Q_ASSERT with QBS_ASSERT / QBS_CHECK

Change-Id: I9f4d43b9b7be7e4ce814963d1feee81605a9d2eb
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

17 files changed, 63 insertions, 48 deletions

diff --git a/src/lib/api/jobs.cpp b/src/lib/api/jobs.cpp
index 3a5c7134a..c97b88c4f 100644
--- a/src/lib/api/jobs.cpp
+++ b/src/lib/api/jobs.cpp
@@ -35,6 +35,7 @@
 #include <language/language.h>
 #include <language/scriptengine.h>
 #include <tools/setupprojectparameters.h>
+#include <tools/qbsassert.h>
 
 namespace qbs {
 using namespace Internal;
@@ -157,7 +158,7 @@ void AbstractJob::handleTaskProgress(int newProgressValue)
 
 void AbstractJob::handleFinished()
 {
-    Q_ASSERT(m_state != StateFinished);
+    QBS_ASSERT(m_state != StateFinished, return);
     m_state = StateFinished;
     emit finished(!hasError(), this);
 }
diff --git a/src/lib/api/project.cpp b/src/lib/api/project.cpp
index 1c73f7d66..69f3abff7 100644
--- a/src/lib/api/project.cpp
+++ b/src/lib/api/project.cpp
@@ -50,6 +50,7 @@
 #include <tools/scripttools.h>
 #include <tools/settings.h>
 #include <tools/setupprojectparameters.h>
+#include <tools/qbsassert.h>
 
 #include <QDir>
 #include <QMutex>
@@ -391,7 +392,7 @@ QString Project::targetExecutable(const ProductData &product, const QString &_in
 RunEnvironment Project::getRunEnvironment(const ProductData &product,
         const QProcessEnvironment &environment, Settings *settings) const
 {
-    Q_ASSERT(product.isEnabled());
+    QBS_CHECK(product.isEnabled());
     const ResolvedProductPtr resolvedProduct = d->internalProduct(product)->rProduct;
     return RunEnvironment(resolvedProduct, environment, settings, d->logger);
 }
diff --git a/src/lib/buildgraph/buildgraph.cpp b/src/lib/buildgraph/buildgraph.cpp
index bd70e199a..a6de3ae92 100644
--- a/src/lib/buildgraph/buildgraph.cpp
+++ b/src/lib/buildgraph/buildgraph.cpp
@@ -36,6 +36,7 @@
 #include <language/scriptengine.h>
 #include <logging/logger.h>
 #include <tools/fileinfo.h>
+#include <tools/qbsassert.h>
 
 #include <QFile>
 
@@ -117,7 +118,7 @@ bool findPath(Artifact *u, Artifact *v, QList<Artifact*> &path)
  */
 void connect(Artifact *p, Artifact *c)
 {
-    Q_ASSERT(p != c);
+    QBS_CHECK(p != c);
     p->children.insert(c);
     c->parents.insert(p);
     p->project->markDirty();
@@ -125,7 +126,7 @@ void connect(Artifact *p, Artifact *c)
 
 void loggedConnect(Artifact *u, Artifact *v, const Logger &logger)
 {
-    Q_ASSERT(u != v);
+    QBS_CHECK(u != v);
     if (logger.traceEnabled()) {
         logger.qbsTrace() << QString::fromLocal8Bit("[BG] connect '%1' -> '%2'")
                              .arg(relativeArtifactFileName(u), relativeArtifactFileName(v));
@@ -147,7 +148,7 @@ static bool existsPath(Artifact *u, Artifact *v)
 
 bool safeConnect(Artifact *u, Artifact *v, const Logger &logger)
 {
-    Q_ASSERT(u != v);
+    QBS_CHECK(u != v);
     if (logger.traceEnabled()) {
         logger.qbsTrace() << QString::fromLocal8Bit("[BG] safeConnect: '%1' '%2'")
                              .arg(relativeArtifactFileName(u), relativeArtifactFileName(v));
diff --git a/src/lib/buildgraph/buildproduct.cpp b/src/lib/buildgraph/buildproduct.cpp
index 7dd41a1c2..1459a6168 100644
--- a/src/lib/buildgraph/buildproduct.cpp
+++ b/src/lib/buildgraph/buildproduct.cpp
@@ -36,6 +36,7 @@
 #include <logging/logger.h>
 #include <tools/error.h>
 #include <tools/persistence.h>
+#include <tools/qbsassert.h>
 
 namespace qbs {
 namespace Internal {
@@ -127,9 +128,9 @@ Artifact *BuildProduct::createArtifact(const SourceArtifactConstPtr &sourceArtif
 
 void BuildProduct::insertArtifact(Artifact *artifact, const Logger &logger)
 {
-    Q_ASSERT(!artifact->product);
-    Q_ASSERT(!artifact->filePath().isEmpty());
-    Q_ASSERT(!artifacts.contains(artifact));
+    QBS_CHECK(!artifact->product);
+    QBS_CHECK(!artifact->filePath().isEmpty());
+    QBS_CHECK(!artifacts.contains(artifact));
 #ifdef QT_DEBUG
     foreach (const BuildProductPtr &otherProduct, project->buildProducts()) {
         if (otherProduct->lookupArtifact(artifact->filePath())) {
diff --git a/src/lib/buildgraph/buildproject.cpp b/src/lib/buildgraph/buildproject.cpp
index 1e73be0e0..e4b8d15ef 100644
--- a/src/lib/buildgraph/buildproject.cpp
+++ b/src/lib/buildgraph/buildproject.cpp
@@ -42,6 +42,7 @@
 #include <tools/error.h>
 #include <tools/persistence.h>
 #include <tools/setupprojectparameters.h>
+#include <tools/qbsassert.h>
 
 #include <QDir>
 
@@ -133,7 +134,7 @@ QList<Artifact *> BuildProject::lookupArtifacts(const QString &dirPath, const QS
 
 void BuildProject::insertFileDependency(Artifact *artifact)
 {
-    Q_ASSERT(artifact->artifactType == Artifact::FileDependency);
+    QBS_CHECK(artifact->artifactType == Artifact::FileDependency);
     m_dependencyArtifacts += artifact;
     insertIntoArtifactLookupTable(artifact);
 }
@@ -230,7 +231,7 @@ void BuildProject::updateNodesThatMustGetNewTransformer()
 
 void BuildProject::updateNodeThatMustGetNewTransformer(Artifact *artifact)
 {
-    Q_ASSERT(artifact->transformer);
+    QBS_CHECK(artifact->transformer);
 
     if (m_logger.debugEnabled()) {
         m_logger.qbsDebug() << "[BG] updating transformer for "
@@ -631,7 +632,7 @@ void BuildProjectLoader::onProductChanged(const BuildProductPtr &product,
             m_logger.qbsDebug() << "[BG] artifact '" << a->absoluteFilePath
                                 << "' removed from product " << product->rProduct->name;
             Artifact *artifact = product->lookupArtifact(a->absoluteFilePath);
-            Q_ASSERT(artifact);
+            QBS_CHECK(artifact);
             removeArtifactAndExclusiveDependents(artifact, &artifactsToRemove);
             continue;
         }
@@ -650,7 +651,7 @@ void BuildProjectLoader::onProductChanged(const BuildProductPtr &product,
                     << a->absoluteFilePath << "' from " << a->fileTags << " to "
                     << changedArtifact->fileTags;
             Artifact *artifact = product->lookupArtifact(a->absoluteFilePath);
-            Q_ASSERT(artifact);
+            QBS_CHECK(artifact);
 
             // handle added filetags
             foreach (const QString &addedFileTag, changedArtifact->fileTags - a->fileTags)
diff --git a/src/lib/buildgraph/command.cpp b/src/lib/buildgraph/command.cpp
index 980112cba..9e5d0889e 100644
--- a/src/lib/buildgraph/command.cpp
+++ b/src/lib/buildgraph/command.cpp
@@ -28,6 +28,7 @@
 ****************************************************************************/
 
 #include "command.h"
+#include <tools/qbsassert.h>
 
 #include <QScriptEngine>
 #include <QScriptValueIterator>
@@ -117,7 +118,7 @@ static QScriptValue js_Command(QScriptContext *context, QScriptEngine *engine)
 
 void ProcessCommand::setupForJavaScript(QScriptValue targetObject)
 {
-    Q_ASSERT(targetObject.isObject());
+    QBS_CHECK(targetObject.isObject());
     QScriptValue ctor = targetObject.engine()->newFunction(js_Command, 2);
     targetObject.setProperty("Command", ctor);
 }
@@ -184,7 +185,7 @@ static QScriptValue js_JavaScriptCommand(QScriptContext *context, QScriptEngine
 
 void JavaScriptCommand::setupForJavaScript(QScriptValue targetObject)
 {
-    Q_ASSERT(targetObject.isObject());
+    QBS_CHECK(targetObject.isObject());
     QScriptValue ctor = targetObject.engine()->newFunction(js_JavaScriptCommand, 0);
     targetObject.setProperty("JavaScriptCommand", ctor);
 }
diff --git a/src/lib/buildgraph/executor.cpp b/src/lib/buildgraph/executor.cpp
index c8586c9ed..c92483265 100644
--- a/src/lib/buildgraph/executor.cpp
+++ b/src/lib/buildgraph/executor.cpp
@@ -45,6 +45,7 @@
 #include <tools/error.h>
 #include <tools/fileinfo.h>
 #include <tools/progressobserver.h>
+#include <tools/qbsassert.h>
 
 #include <QDir>
 #include <QSet>
@@ -140,7 +141,7 @@ FileTime Executor::recursiveFileTime(const QString &filePath) const
 
 void Executor::retrieveSourceFileTimestamp(Artifact *artifact) const
 {
-    Q_ASSERT(artifact->artifactType == Artifact::SourceFile);
+    QBS_CHECK(artifact->artifactType == Artifact::SourceFile);
 
     artifact->timestamp = recursiveFileTime(artifact->filePath());
     artifact->timestampRetrieved = true;
@@ -168,7 +169,7 @@ void Executor::doBuild()
         m_logger.qbsDebug() << "max job count not explicitly set, using value of "
                             << m_buildOptions.maxJobCount;
     }
-    Q_ASSERT(m_state == ExecutorIdle);
+    QBS_CHECK(m_state == ExecutorIdle);
     m_leaves.clear();
     m_error.clear();
     m_explicitlyCanceled = false;
@@ -294,7 +295,7 @@ void Executor::initLeavesTopDown(Artifact *artifact, QSet<Artifact *> &seenArtif
 // Returns true if some artifacts are still waiting to be built or currently building.
 bool Executor::scheduleJobs()
 {
-    Q_ASSERT(m_state == ExecutorRunning);
+    QBS_CHECK(m_state == ExecutorRunning);
     while (!m_leaves.isEmpty() && !m_availableJobs.isEmpty())
         buildArtifact(m_leaves.takeFirst());
     return !m_leaves.isEmpty() || !m_processingJobs.isEmpty();
@@ -302,7 +303,7 @@ bool Executor::scheduleJobs()
 
 bool Executor::isUpToDate(Artifact *artifact) const
 {
-    Q_ASSERT(artifact->artifactType == Artifact::Generated);
+    QBS_CHECK(artifact->artifactType == Artifact::Generated);
 
     const bool debug = false;
     if (debug) {
@@ -317,7 +318,7 @@ bool Executor::isUpToDate(Artifact *artifact) const
     }
 
     foreach (Artifact *child, artifact->children) {
-        Q_ASSERT(child->timestamp.isValid());
+        QBS_CHECK(child->timestamp.isValid());
         if (debug)
             m_logger.qbsDebug() << "[UTD] child timestamp " << child->timestamp.toString();
         if (artifact->timestamp < child->timestamp)
@@ -347,13 +348,13 @@ bool Executor::mustExecuteTransformer(const TransformerPtr &transformer) const
 
     // All outputs of the transformer have alwaysUpdated == false.
     // We need at least on output that is always updated.
-    Q_ASSERT(false);
+    QBS_CHECK(false);
     return true;
 }
 
 void Executor::buildArtifact(Artifact *artifact)
 {
-    Q_ASSERT(!m_availableJobs.isEmpty());
+    QBS_CHECK(!m_availableJobs.isEmpty());
 
     if (m_doDebug)
         m_logger.qbsDebug() << "[EXEC] " << relativeArtifactFileName(artifact);
@@ -381,7 +382,7 @@ void Executor::buildArtifact(Artifact *artifact)
     }
 
     // Every generated artifact must have a transformer.
-    Q_ASSERT(artifact->transformer);
+    QBS_CHECK(artifact->transformer);
 
     // Skip if outputs of this transformer are already built.
     // That means we already ran the transformation.
@@ -471,11 +472,11 @@ void Executor::buildArtifact(Artifact *artifact)
 
 void Executor::finishJob(ExecutorJob *job, bool success)
 {
-    Q_ASSERT(job);
-    Q_ASSERT(m_state != ExecutorIdle);
+    QBS_CHECK(job);
+    QBS_CHECK(m_state != ExecutorIdle);
 
     const QHash<ExecutorJob *, Artifact *>::Iterator it = m_processingJobs.find(job);
-    Q_ASSERT(it != m_processingJobs.end());
+    QBS_CHECK(it != m_processingJobs.end());
     if (success)
         finishArtifact(it.value());
     m_processingJobs.erase(it);
@@ -514,7 +515,7 @@ static bool allChildrenBuilt(Artifact *artifact)
 
 void Executor::finishArtifact(Artifact *leaf)
 {
-    Q_ASSERT(leaf);
+    QBS_CHECK(leaf);
 
     if (m_doTrace)
         m_logger.qbsTrace() << "[EXEC] finishArtifact " << relativeArtifactFileName(leaf);
@@ -613,9 +614,9 @@ void Executor::setupProgressObserver(bool mocWillRun)
 
 void Executor::doSanityChecks()
 {
-    Q_ASSERT(!m_productsToBuild.isEmpty());
+    QBS_CHECK(!m_productsToBuild.isEmpty());
     for (int i = 1; i < m_productsToBuild.count(); ++i)
-        Q_ASSERT(m_productsToBuild.at(i)->project == m_productsToBuild.first()->project);
+        QBS_CHECK(m_productsToBuild.at(i)->project == m_productsToBuild.first()->project);
 }
 
 void Executor::handleError(const Error &error)
@@ -688,9 +689,9 @@ void Executor::onProcessSuccess()
 {
     try {
         ExecutorJob *job = qobject_cast<ExecutorJob *>(sender());
-        Q_ASSERT(job);
+        QBS_CHECK(job);
         Artifact *processedArtifact = m_processingJobs.value(job);
-        Q_ASSERT(processedArtifact);
+        QBS_CHECK(processedArtifact);
 
         // Update the timestamps of the outputs of the transformer we just executed.
         processedArtifact->project->markDirty();
@@ -709,7 +710,7 @@ void Executor::onProcessSuccess()
 
 void Executor::finish()
 {
-    Q_ASSERT(m_state != ExecutorIdle);
+    QBS_CHECK(m_state != ExecutorIdle);
 
     QStringList unbuiltProductNames;
     foreach (BuildProductPtr buildProduct, m_productsToBuild) {
diff --git a/src/lib/buildgraph/executorjob.cpp b/src/lib/buildgraph/executorjob.cpp
index 37e241af1..50059ee91 100644
--- a/src/lib/buildgraph/executorjob.cpp
+++ b/src/lib/buildgraph/executorjob.cpp
@@ -36,6 +36,7 @@
 #include "transformer.h"
 #include <language/language.h>
 #include <tools/error.h>
+#include <tools/qbsassert.h>
 
 #include <QThread>
 
@@ -80,7 +81,7 @@ void ExecutorJob::setDryRun(bool enabled)
 
 void ExecutorJob::run(Transformer *t, const BuildProduct *buildProduct)
 {
-    Q_ASSERT(m_currentCommandIdx == -1);
+    QBS_ASSERT(m_currentCommandIdx == -1, return);
 
     if (t->commands.isEmpty()) {
         emit success();
@@ -108,7 +109,7 @@ void ExecutorJob::waitForFinished()
 
 void ExecutorJob::runNextCommand()
 {
-    Q_ASSERT(m_currentCommandIdx <= m_transformer->commands.count());
+    QBS_ASSERT(m_currentCommandIdx <= m_transformer->commands.count(), return);
     ++m_currentCommandIdx;
     if (m_currentCommandIdx >= m_transformer->commands.count()) {
         setInactive();
diff --git a/src/lib/buildgraph/inputartifactscanner.cpp b/src/lib/buildgraph/inputartifactscanner.cpp
index 1b3a41494..0d5c98e70 100644
--- a/src/lib/buildgraph/inputartifactscanner.cpp
+++ b/src/lib/buildgraph/inputartifactscanner.cpp
@@ -39,6 +39,7 @@
 #include <language/language.h>
 #include <tools/fileinfo.h>
 #include <tools/scannerpluginmanager.h>
+#include <tools/qbsassert.h>
 
 #include <QDir>
 #include <QSet>
@@ -308,8 +309,8 @@ void InputArtifactScanner::handleDependency(ResolvedDependency &dependency)
 {
     BuildProduct *product = m_artifact->product;
     bool insertIntoProduct = true;
-    Q_ASSERT(m_artifact->artifactType == Artifact::Generated);
-    Q_ASSERT(m_artifact->product);
+    QBS_CHECK(m_artifact->artifactType == Artifact::Generated);
+    QBS_CHECK(m_artifact->product);
 
     if (!dependency.artifact) {
         // The dependency is an existing file but does not exist in the build graph.
diff --git a/src/lib/buildgraph/processcommandexecutor.cpp b/src/lib/buildgraph/processcommandexecutor.cpp
index ef02566cd..c61a8f700 100644
--- a/src/lib/buildgraph/processcommandexecutor.cpp
+++ b/src/lib/buildgraph/processcommandexecutor.cpp
@@ -41,6 +41,7 @@
 #include <tools/fileinfo.h>
 #include <tools/hostosinfo.h>
 #include <tools/processresult.h>
+#include <tools/qbsassert.h>
 
 #include <QDir>
 #include <QScriptEngine>
@@ -94,7 +95,7 @@ static QString commandArgsToString(const QStringList &args)
 
 void ProcessCommandExecutor::doStart()
 {
-    Q_ASSERT(m_process.state() == QProcess::NotRunning);
+    QBS_ASSERT(m_process.state() == QProcess::NotRunning, return);
 
     const ProcessCommand * const cmd = processCommand();
     QString program = cmd->program();
diff --git a/src/lib/buildgraph/rulesapplicator.cpp b/src/lib/buildgraph/rulesapplicator.cpp
index 32dea991a..dd089f11e 100644
--- a/src/lib/buildgraph/rulesapplicator.cpp
+++ b/src/lib/buildgraph/rulesapplicator.cpp
@@ -40,6 +40,7 @@
 #include <logging/translator.h>
 #include <tools/error.h>
 #include <tools/scripttools.h>
+#include <tools/qbsassert.h>
 
 #include <QDir>
 
@@ -282,7 +283,7 @@ Artifact *RulesApplicator::createOutputArtifact(const RuleArtifactConstPtr &rule
     }
 
     foreach (Artifact *inputArtifact, inputArtifacts) {
-        Q_ASSERT(outputArtifact != inputArtifact);
+        QBS_CHECK(outputArtifact != inputArtifact);
         loggedConnect(outputArtifact, inputArtifact, m_logger);
     }
 
diff --git a/src/lib/buildgraph/rulesevaluationcontext.cpp b/src/lib/buildgraph/rulesevaluationcontext.cpp
index 61de6b790..6385bbea3 100644
--- a/src/lib/buildgraph/rulesevaluationcontext.cpp
+++ b/src/lib/buildgraph/rulesevaluationcontext.cpp
@@ -37,6 +37,7 @@
 #include <tools/error.h>
 #include <tools/fileinfo.h>
 #include <tools/progressobserver.h>
+#include <tools/qbsassert.h>
 
 #include <QVariant>
 
@@ -99,7 +100,7 @@ void RulesEvaluationContext::initScope()
 
 void RulesEvaluationContext::cleanupScope()
 {
-    Q_ASSERT(m_initScopeCalls > 0);
+    QBS_CHECK(m_initScopeCalls > 0);
     if (--m_initScopeCalls > 0)
         return;
 
diff --git a/src/lib/buildgraph/transformer.cpp b/src/lib/buildgraph/transformer.cpp
index 297b0e6ff..d9cf7d205 100644
--- a/src/lib/buildgraph/transformer.cpp
+++ b/src/lib/buildgraph/transformer.cpp
@@ -35,6 +35,7 @@
 #include <language/scriptengine.h>
 #include <tools/error.h>
 #include <tools/persistence.h>
+#include <tools/qbsassert.h>
 
 namespace qbs {
 namespace Internal {
@@ -105,7 +106,7 @@ void Transformer::setupOutputs(QScriptEngine *scriptEngine, QScriptValue targetS
     if (outputs.count() == 1) {
         Artifact *output = *outputs.begin();
         const QSet<QString> &fileTags = output->fileTags;
-        Q_ASSERT(!fileTags.isEmpty());
+        QBS_ASSERT(!fileTags.isEmpty(), return);
         QScriptValue outputsForFileTag = scriptValue.property(*fileTags.begin());
         QScriptValue outputScriptValue = outputsForFileTag.property(0);
         targetScriptValue.setProperty("output", outputScriptValue);
diff --git a/src/lib/language/language.cpp b/src/lib/language/language.cpp
index a98008e99..412c00775 100644
--- a/src/lib/language/language.cpp
+++ b/src/lib/language/language.cpp
@@ -35,6 +35,7 @@
 #include <tools/error.h>
 #include <tools/persistence.h>
 #include <tools/scripttools.h>
+#include <tools/qbsassert.h>
 
 #include <QDir>
 #include <QDirIterator>
@@ -101,7 +102,7 @@ QScriptValue PropertyMap::toScriptValue(QScriptEngine *scriptEngine) const
 {
     QMutexLocker ml(&m_scriptValueCacheMutex);
     QScriptValue result = m_scriptValueCache.value(scriptEngine);
-    Q_ASSERT(!result.isValid() || result.engine() == scriptEngine);
+    QBS_ASSERT(!result.isValid() || result.engine() == scriptEngine, return QScriptValue());
     if (!result.isValid()) {
         result = scriptEngine->toScriptValue(m_value);
         m_scriptValueCache[scriptEngine] = result;
@@ -760,7 +761,7 @@ void SourceWildCards::expandPatterns(QSet<QString> &result, const GroupConstPtr
     QDirIterator it(baseDir, QStringList(filePattern), itFilters, itFlags);
     while (it.hasNext()) {
         const QString filePath = it.next();
-        Q_ASSERT(FileInfo(filePath).isDir() == isDir);
+        QBS_ASSERT(FileInfo(filePath).isDir() == isDir, break);
         if (isDir)
             expandPatterns(result, group, changed_parts, filePath);
         else
diff --git a/src/lib/language/scriptengine.cpp b/src/lib/language/scriptengine.cpp
index 11cdaf514..5ae667e3e 100644
--- a/src/lib/language/scriptengine.cpp
+++ b/src/lib/language/scriptengine.cpp
@@ -30,6 +30,7 @@
 #include "scriptengine.h"
 
 #include <tools/error.h>
+#include <tools/qbsassert.h>
 
 #include <QFile>
 #include <QScriptProgram>
@@ -59,9 +60,9 @@ void ScriptEngine::import(const JsImports &jsImports, QScriptValue scope, QScrip
 
 void ScriptEngine::import(const JsImport &jsImport, QScriptValue scope, QScriptValue targetObject)
 {
-    Q_ASSERT(!scope.isValid() || scope.isObject());
-    Q_ASSERT(targetObject.isObject());
-    Q_ASSERT(targetObject.engine() == this);
+    QBS_ASSERT(!scope.isValid() || scope.isObject(), return);
+    QBS_ASSERT(targetObject.isObject(), return);
+    QBS_ASSERT(targetObject.engine() == this, return);
 
     if (debugJSImports)
         m_logger.qbsDebug() << "[ENGINE] import into " << jsImport.scopeName;
diff --git a/src/lib/tools/fileinfo.cpp b/src/lib/tools/fileinfo.cpp
index 5712962df..6c043bc93 100644
--- a/src/lib/tools/fileinfo.cpp
+++ b/src/lib/tools/fileinfo.cpp
@@ -31,13 +31,12 @@
 
 #include <logging/translator.h>
 #include <tools/hostosinfo.h>
+#include <tools/qbsassert.h>
 
 #include <QCoreApplication>
 #include <QDir>
 #include <QFileInfo>
 
-#include <cassert>
-
 #ifdef Q_OS_UNIX
 #include <sys/stat.h>
 #endif
@@ -159,7 +158,7 @@ bool FileInfo::isPattern(const QStringRef &str)
  */
 QString FileInfo::resolvePath(const QString &base, const QString &rel)
 {
-    Q_ASSERT(isAbsolute(base));
+    QBS_ASSERT(isAbsolute(base), return QString());
     if (isAbsolute(rel))
         return rel;
     if (rel.size() == 1 && rel.at(0) == QLatin1Char('.'))
diff --git a/src/lib/tools/persistence.cpp b/src/lib/tools/persistence.cpp
index 5a3ec689a..40b5a5688 100644
--- a/src/lib/tools/persistence.cpp
+++ b/src/lib/tools/persistence.cpp
@@ -31,6 +31,7 @@
 
 #include "fileinfo.h"
 #include <tools/error.h>
+#include <tools/qbsassert.h>
 
 #include <QDir>
 #include <QScopedPointer>
@@ -88,7 +89,7 @@ bool PersistentPool::setupWriteStream(const QString &filePath)
 
     if (QFile::exists(filePath) && !QFile::remove(filePath))
         return false;
-    Q_ASSERT(!QFile::exists(filePath));
+    QBS_CHECK(!QFile::exists(filePath));
     QScopedPointer<QFile> file(new QFile(filePath));
     if (!file->open(QFile::WriteOnly))
         return false;