summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools/cpppreprocessor.cpp
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@digia.com>2013-10-24 08:56:29 +0200
committerEike Ziller <eike.ziller@digia.com>2013-10-24 08:56:29 +0200
commitc3119d1aa70a25ab7aeb39b0448c1d10c08aba6a (patch)
treec2204d569f87e28bc2e48a763650e1b99871f0ed /src/plugins/cpptools/cpppreprocessor.cpp
parent328daa9c5aa9a438a0187bb28e238396451f8548 (diff)
parentb889bb1608badceed0dc1175f3322ea8015f8924 (diff)
downloadqt-creator-c3119d1aa70a25ab7aeb39b0448c1d10c08aba6a.tar.gz
Merge remote-tracking branch 'origin/3.0'
Conflicts: qtcreator.pri src/plugins/qnx/qnxutils.cpp Change-Id: I019ad21fb4c128eb736c8ab2d09310757e3be037
Diffstat (limited to 'src/plugins/cpptools/cpppreprocessor.cpp')
-rw-r--r--src/plugins/cpptools/cpppreprocessor.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/plugins/cpptools/cpppreprocessor.cpp b/src/plugins/cpptools/cpppreprocessor.cpp
index f60c853b83..63e64c61a1 100644
--- a/src/plugins/cpptools/cpppreprocessor.cpp
+++ b/src/plugins/cpptools/cpppreprocessor.cpp
@@ -416,7 +416,6 @@ void CppPreprocessor::sourceNeeded(unsigned line, const QString &fileName, Inclu
if (m_dumpFileNameWhileParsing) {
qDebug() << "Parsing file:" << absoluteFileName
<< "contents:" << contents.size() << "bytes";
- ;
}
Document::Ptr doc = m_snapshot.document(absoluteFileName);