feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Remove Debugging output

Browse Source
This commit is contained in:
dt
2009-11-11 18:36:03 +01:00
parent 3f3a36b728
commit 5c14507506
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/projectexplorer/buildstep.h
View File

@@ -127,6 +127,8 @@ protected:
Q_SIGNALS: Q_SIGNALS:
void addToTaskWindow(const QString &filename, int type, int linenumber, const QString &description); void addToTaskWindow(const QString &filename, int type, int linenumber, const QString &description);
// The string is added to the output window
// It should be in html format, that is properly escaped
void addToOutputWindow(const QString &string); void addToOutputWindow(const QString &string);
private: private:

6
src/plugins/qt4projectmanager/qt4project.cpp
View File

@@ -1304,19 +1304,19 @@ bool Qt4Project::compareBuildConfigurationToImportFrom(BuildConfiguration *confi
QStringList actualArgs = removeSpecFromArgumentList(qs->value(configuration->name(), "qmakeArgs").toStringList()); QStringList actualArgs = removeSpecFromArgumentList(qs->value(configuration->name(), "qmakeArgs").toStringList());
QStringList parsedArgs = removeSpecFromArgumentList(result.second); QStringList parsedArgs = removeSpecFromArgumentList(result.second);
// if (debug) { if (debug) {
qDebug()<<"Actual args:"<<actualArgs; qDebug()<<"Actual args:"<<actualArgs;
qDebug()<<"Parsed args:"<<parsedArgs; qDebug()<<"Parsed args:"<<parsedArgs;
qDebug()<<"Actual spec:"<<actualSpec; qDebug()<<"Actual spec:"<<actualSpec;
qDebug()<<"Parsed spec:"<<parsedSpec; qDebug()<<"Parsed spec:"<<parsedSpec;
// } }
if (actualArgs == parsedArgs) { if (actualArgs == parsedArgs) {
// Specs match exactly // Specs match exactly
if (actualSpec == parsedSpec) if (actualSpec == parsedSpec)
return true; return true;
// Actual spec is the default one // Actual spec is the default one
qDebug()<<"AS vs VS"<<actualSpec<<version->mkspec(); // qDebug()<<"AS vs VS"<<actualSpec<<version->mkspec();
if ((actualSpec == version->mkspec() || actualSpec == "default") if ((actualSpec == version->mkspec() || actualSpec == "default")
&& (parsedSpec == version->mkspec() || parsedSpec == "default" || parsedSpec.isEmpty())) && (parsedSpec == version->mkspec() || parsedSpec == "default" || parsedSpec.isEmpty()))
return true; return true;

6
src/plugins/qt4projectmanager/qtversionmanager.cpp
View File

@@ -1057,7 +1057,7 @@ void QtVersion::updateToolChainAndMkspec() const
m_toolChains.clear(); m_toolChains.clear();
qDebug()<<"Finding mkspec for"<<qmakeCommand(); // qDebug()<<"Finding mkspec for"<<qmakeCommand();
// no .qmake.cache so look at the default mkspec // no .qmake.cache so look at the default mkspec
@@ -1131,7 +1131,7 @@ void QtVersion::updateToolChainAndMkspec() const
if (mkspec.startsWith(baseMkspecDir)) { if (mkspec.startsWith(baseMkspecDir)) {
mkspec = mkspec.mid(baseMkspecDir.length() + 1); mkspec = mkspec.mid(baseMkspecDir.length() + 1);
qDebug() << "Setting mkspec to"<<mkspec; // qDebug() << "Setting mkspec to"<<mkspec;
} else { } else {
QString sourceMkSpecPath = sourcePath() + "/mkspecs"; QString sourceMkSpecPath = sourcePath() + "/mkspecs";
if (mkspec.startsWith(sourceMkSpecPath)) { if (mkspec.startsWith(sourceMkSpecPath)) {
@@ -1143,7 +1143,7 @@ void QtVersion::updateToolChainAndMkspec() const
m_mkspec = mkspec; m_mkspec = mkspec;
qDebug()<<"mkspec for "<<qmakeCommand()<<" is "<<m_mkspec<<m_mkspecFullPath; // qDebug()<<"mkspec for "<<qmakeCommand()<<" is "<<m_mkspec<<m_mkspecFullPath;
ProFileReader *reader = new ProFileReader(); ProFileReader *reader = new ProFileReader();
reader->setQtVersion(this); reader->setQtVersion(this);