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

Remove debugging output, running qmake works for most people.

Browse Source
This commit is contained in:
dt
2009-08-17 11:49:59 +02:00
parent 97bf35fefb
commit 74602f3119
2 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1195,10 +1195,12 @@ bool Qt4Project::compareBuildConfigurationToImportFrom(const QString &buildConfi
parsedSpec = parsedSpec.toLower(); parsedSpec = parsedSpec.toLower();
#endif #endif
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 && actualSpec == parsedSpec) if (actualArgs == parsedArgs && actualSpec == parsedSpec)
return true; return true;

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

@@ -68,6 +68,8 @@ static const char *defaultQtVersionKey = "DefaultQtVersion";
static const char *newQtVersionsKey = "NewQtVersions"; static const char *newQtVersionsKey = "NewQtVersions";
static const char *PATH_AUTODETECTION_SOURCE = "PATH"; static const char *PATH_AUTODETECTION_SOURCE = "PATH";
enum { debug = 0 };
QtVersionManager *QtVersionManager::m_self = 0; QtVersionManager *QtVersionManager::m_self = 0;
QtVersionManager::QtVersionManager() QtVersionManager::QtVersionManager()
@@ -551,29 +553,32 @@ void dumpQMakeAssignments(const QList<QMakeAssignment> &list)
} }
} }
// New code
QPair<QtVersion::QmakeBuildConfig, QStringList> QtVersionManager::scanMakeFile(const QString &directory, QtVersion::QmakeBuildConfig defaultBuildConfig) QPair<QtVersion::QmakeBuildConfig, QStringList> QtVersionManager::scanMakeFile(const QString &directory, QtVersion::QmakeBuildConfig defaultBuildConfig)
{ {
if (debug)
qDebug()<<"ScanMakeFile, the gory details:"; qDebug()<<"ScanMakeFile, the gory details:";
QtVersion::QmakeBuildConfig result = QtVersion::NoBuild; QtVersion::QmakeBuildConfig result = QtVersion::NoBuild;
QStringList result2; QStringList result2;
QString line = findQMakeLine(directory); QString line = findQMakeLine(directory);
if (!line.isEmpty()) { if (!line.isEmpty()) {
if (debug)
qDebug()<<"Found line"<<line; qDebug()<<"Found line"<<line;
line = trimLine(line); line = trimLine(line);
qDebug()<<"Trimmed to"<<line;
QStringList parts = splitLine(line); QStringList parts = splitLine(line);
if (debug)
qDebug()<<"Splitted into"<<parts; qDebug()<<"Splitted into"<<parts;
QList<QMakeAssignment> assignments; QList<QMakeAssignment> assignments;
QList<QMakeAssignment> afterAssignments; QList<QMakeAssignment> afterAssignments;
QStringList additionalArguments; QStringList additionalArguments;
parseParts(parts, &assignments, &afterAssignments, &additionalArguments); parseParts(parts, &assignments, &afterAssignments, &additionalArguments);
if (debug) {
dumpQMakeAssignments(assignments); dumpQMakeAssignments(assignments);
if (!afterAssignments.isEmpty()) if (!afterAssignments.isEmpty())
qDebug()<<"-after"; qDebug()<<"-after";
dumpQMakeAssignments(afterAssignments); dumpQMakeAssignments(afterAssignments);
}
// Search in assignments for CONFIG(+=,-=,=)(debug,release,debug_and_release) // Search in assignments for CONFIG(+=,-=,=)(debug,release,debug_and_release)
// Also remove them from the list // Also remove them from the list
@@ -592,6 +597,7 @@ QPair<QtVersion::QmakeBuildConfig, QStringList> QtVersionManager::scanMakeFile(c
} }
// Dump the gathered information: // Dump the gathered information:
if (debug) {
qDebug()<<"\n\nDumping information from scanMakeFile"; qDebug()<<"\n\nDumping information from scanMakeFile";
qDebug()<<"QMake CONFIG variable parsing"; qDebug()<<"QMake CONFIG variable parsing";
qDebug()<<" "<< (result & QtVersion::NoBuild ? "No Build" : QString::number(int(result))); qDebug()<<" "<< (result & QtVersion::NoBuild ? "No Build" : QString::number(int(result)));
@@ -600,6 +606,7 @@ QPair<QtVersion::QmakeBuildConfig, QStringList> QtVersionManager::scanMakeFile(c
qDebug()<<"\nAddtional Arguments"; qDebug()<<"\nAddtional Arguments";
qDebug()<<result2; qDebug()<<result2;
qDebug()<<"\n\n"; qDebug()<<"\n\n";
}
return qMakePair(result, result2); return qMakePair(result, result2);
} }
@@ -690,7 +697,6 @@ void QtVersionManager::parseParts(const QStringList &parts, QList<QMakeAssignmen
} else if (part == "-o") { } else if (part == "-o") {
ignoreNext = true; ignoreNext = true;
} else { } else {
qDebug()<<"Not parsed"<<part;
additionalArguments->append(part); additionalArguments->append(part);
} }
} }