diff --git a/src/plugins/qtsupport/profilereader.cpp b/src/plugins/qtsupport/profilereader.cpp index ad4afe14097b67843693b9a2eb4a1747bd6b0886..6b122ca13c212132594d68271f413cb6ea488db4 100644 --- a/src/plugins/qtsupport/profilereader.cpp +++ b/src/plugins/qtsupport/profilereader.cpp @@ -59,9 +59,10 @@ void ProMessageHandler::message(int type, const QString &msg, const QString &fil emit writeMessage(format(fileName, lineNo, msg), Core::MessageManager::NoModeSwitch); } -void ProMessageHandler::fileMessage(const QString &) +void ProMessageHandler::fileMessage(const QString &msg) { - // we ignore these... + if (m_verbose) + emit writeMessage(msg, Core::MessageManager::NoModeSwitch); } @@ -78,6 +79,12 @@ ProFileReader::~ProFileReader() pf->deref(); } +void ProFileReader::setCumulative(bool on) +{ + ProMessageHandler::setVerbose(!on); + ProFileEvaluator::setCumulative(on); +} + void ProFileReader::aboutToEval(ProFile *, ProFile *pro, EvalFileType type) { if (m_ignoreLevel || (type != EvalProjectFile && type != EvalIncludeFile)) { diff --git a/src/plugins/qtsupport/profilereader.h b/src/plugins/qtsupport/profilereader.h index a8dc62a345acbe0ce3befefbbf2315ae52f64072..531b7a3e633fedd18c06cd538633b8aa3f038ec2 100644 --- a/src/plugins/qtsupport/profilereader.h +++ b/src/plugins/qtsupport/profilereader.h @@ -49,7 +49,7 @@ class QTSUPPORT_EXPORT ProMessageHandler : public QObject, public QMakeHandler Q_OBJECT public: - ProMessageHandler(bool verbose = false); + ProMessageHandler(bool verbose = true); virtual ~ProMessageHandler() {} virtual void aboutToEval(ProFile *, ProFile *, EvalFileType) {} @@ -57,6 +57,8 @@ public: virtual void message(int type, const QString &msg, const QString &fileName, int lineNo); virtual void fileMessage(const QString &msg); + void setVerbose(bool on) { m_verbose = on; } + signals: void writeMessage(const QString &error, Core::MessageManager::PrintToOutputPaneFlags flag); @@ -72,6 +74,8 @@ public: ProFileReader(ProFileGlobals *option, QMakeVfs *vfs); ~ProFileReader(); + void setCumulative(bool on); + QList<ProFile*> includeFiles() const; ProFile *proFileFor(const QString &name);