summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools/cpptoolsplugin.cpp
diff options
context:
space:
mode:
authorLeandro Melo <leandro.melo@nokia.com>2012-01-23 17:44:49 +0100
committerhjk <qthjk@ovi.com>2012-01-24 09:58:59 +0100
commitefe9bca20c2569f039f0193c6572d88dc024cd3d (patch)
tree3f5173f35c94a6f93f0df32c46478c861b3fcf33 /src/plugins/cpptools/cpptoolsplugin.cpp
parent918131b6e7d8f6db583a8c056749efa675761111 (diff)
downloadqt-creator-efe9bca20c2569f039f0193c6572d88dc024cd3d.tar.gz
C++: Replace non-absolute-critical asserts for soft ones
Change-Id: I021074a78d90929b4e83b8aff9db1ae7995e8c6a Reviewed-by: hjk <qthjk@ovi.com>
Diffstat (limited to 'src/plugins/cpptools/cpptoolsplugin.cpp')
-rw-r--r--src/plugins/cpptools/cpptoolsplugin.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/cpptools/cpptoolsplugin.cpp b/src/plugins/cpptools/cpptoolsplugin.cpp
index c08b639e47..c21cb9b5ed 100644
--- a/src/plugins/cpptools/cpptoolsplugin.cpp
+++ b/src/plugins/cpptools/cpptoolsplugin.cpp
@@ -66,6 +66,7 @@
#include <find/ifindfilter.h>
#include <find/searchresultwindow.h>
#include <utils/filesearch.h>
+#include <utils/qtcassert.h>
#include <QtCore/QtPlugin>
#include <QtCore/QFileInfo>
@@ -325,7 +326,7 @@ QString CppToolsPlugin::correspondingHeaderOrSourceI(const QString &fileName) co
}
if (!bestFileName.isEmpty()) {
const QFileInfo candidateFi(bestFileName);
- Q_ASSERT(candidateFi.isFile());
+ QTC_ASSERT(candidateFi.isFile(), return QString());
m_headerSourceMapping[fi.absoluteFilePath()] = candidateFi.absoluteFilePath();
m_headerSourceMapping[candidateFi.absoluteFilePath()] = fi.absoluteFilePath();
return candidateFi.absoluteFilePath();