Commit f643ab83 authored by dt's avatar dt
Browse files

Qt4ProjectManager: Remove dead code

parent 0609b5b8
...@@ -451,25 +451,16 @@ void Qt4Project::updateCppCodeModel() ...@@ -451,25 +451,16 @@ void Qt4Project::updateCppCodeModel()
// Collect per .pro file information // Collect per .pro file information
foreach (Qt4ProFileNode *pro, proFiles) { foreach (Qt4ProFileNode *pro, proFiles) {
Internal::CodeModelInfo info; allPrecompileHeaders.append(pro->variableValue(PrecompiledHeaderVar));
info.defines = predefinedMacros;
info.frameworkPaths = predefinedFrameworkPaths;
info.precompiledHeader = pro->variableValue(PrecompiledHeaderVar);
allPrecompileHeaders.append(info.precompiledHeader);
// Add custom defines // Add custom defines
foreach (const QString &def, pro->variableValue(DefinesVar)) { foreach (const QString &def, pro->variableValue(DefinesVar)) {
allDefinedMacros += "#define "; allDefinedMacros += "#define ";
info.defines += "#define ";
const int index = def.indexOf(QLatin1Char('=')); const int index = def.indexOf(QLatin1Char('='));
if (index == -1) { if (index == -1) {
allDefinedMacros += def.toLatin1(); allDefinedMacros += def.toLatin1();
allDefinedMacros += " 1\n"; allDefinedMacros += " 1\n";
info.defines += def.toLatin1();
info.defines += " 1\n";
} else { } else {
const QString name = def.left(index); const QString name = def.left(index);
const QString value = def.mid(index + 1); const QString value = def.mid(index + 1);
...@@ -477,10 +468,6 @@ void Qt4Project::updateCppCodeModel() ...@@ -477,10 +468,6 @@ void Qt4Project::updateCppCodeModel()
allDefinedMacros += ' '; allDefinedMacros += ' ';
allDefinedMacros += value.toLocal8Bit(); allDefinedMacros += value.toLocal8Bit();
allDefinedMacros += '\n'; allDefinedMacros += '\n';
info.defines += name.toLatin1();
info.defines += ' ';
info.defines += value.toLocal8Bit();
info.defines += '\n';
} }
} }
...@@ -488,8 +475,6 @@ void Qt4Project::updateCppCodeModel() ...@@ -488,8 +475,6 @@ void Qt4Project::updateCppCodeModel()
foreach (const QString &includePath, proIncludePaths) { foreach (const QString &includePath, proIncludePaths) {
if (!allIncludePaths.contains(includePath)) if (!allIncludePaths.contains(includePath))
allIncludePaths.append(includePath); allIncludePaths.append(includePath);
if (!info.includes.contains(includePath))
info.includes.append(includePath);
} }
#if 0 // Experimental PKGCONFIG support #if 0 // Experimental PKGCONFIG support
...@@ -507,17 +492,6 @@ void Qt4Project::updateCppCodeModel() ...@@ -507,17 +492,6 @@ void Qt4Project::updateCppCodeModel()
} }
} }
#endif #endif
// Add mkspec directory
info.includes.append(activeBC->qtVersion()->mkspecPath());
info.includes.append(predefinedIncludePaths);
// qDebug()<<"Dumping code model information";
// qDebug()<<"for .pro file"<< pro->path();
// qDebug()<<info.defines;
// qDebug()<<info.includes;
// qDebug()<<info.frameworkPaths;
// qDebug()<<"\n";
} }
// Add mkspec directory // Add mkspec directory
......
...@@ -64,15 +64,6 @@ namespace Internal { ...@@ -64,15 +64,6 @@ namespace Internal {
class Qt4ProjectConfigWidget; class Qt4ProjectConfigWidget;
class Qt4NodesWatcher; class Qt4NodesWatcher;
class CodeModelInfo
{
public:
QByteArray defines;
QStringList includes;
QStringList frameworkPaths;
QStringList precompiledHeader;
};
} }
class QMakeStep; class QMakeStep;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment