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

Remove QBuild stuff that was never finished.

Browse Source
This commit is contained in:
dt
2009-07-27 12:50:42 +02:00
parent 1ffd0bbfed
commit eb07777af6
2 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/qt4projectmanager/qt4nodes.cpp
View File

@@ -542,8 +542,7 @@ Qt4ProFileNode::Qt4ProFileNode(Qt4Project *project,
QObject *parent) QObject *parent)
: Qt4PriFileNode(project, this, filePath), : Qt4PriFileNode(project, this, filePath),
// own stuff // own stuff
m_projectType(InvalidProject), m_projectType(InvalidProject)
m_isQBuildProject(false)
{ {
if (parent) if (parent)
setParent(parent); setParent(parent);
@@ -613,12 +612,6 @@ void Qt4ProFileNode::update()
if (debug) if (debug)
qDebug() << "Qt4ProFileNode - updating files for file " << m_projectFilePath; qDebug() << "Qt4ProFileNode - updating files for file " << m_projectFilePath;
#ifdef QTEXTENDED_QBUILD_SUPPORT
if (m_projectFilePath.endsWith("qbuild.pro")) {
m_isQBuildProject = true;
}
#endif
Qt4ProjectType projectType = InvalidProject; Qt4ProjectType projectType = InvalidProject;
switch (reader->templateType()) { switch (reader->templateType()) {
case ProFileEvaluator::TT_Unknown: case ProFileEvaluator::TT_Unknown:
@@ -950,7 +943,6 @@ QStringList Qt4ProFileNode::subDirsPaths(ProFileReader *reader) const
// subid.file = realdir/realfile.pro" // subid.file = realdir/realfile.pro"
QString realDir; QString realDir;
QString realFile;
const QString subDirKey = subDirVar + QLatin1String(".subdir"); const QString subDirKey = subDirVar + QLatin1String(".subdir");
const QString subDirFileKey = subDirVar + QLatin1String(".file"); const QString subDirFileKey = subDirVar + QLatin1String(".file");
if (reader->contains(subDirKey)) if (reader->contains(subDirKey))
@@ -960,15 +952,13 @@ QStringList Qt4ProFileNode::subDirsPaths(ProFileReader *reader) const
else else
realDir = subDirVar; realDir = subDirVar;
QFileInfo info(realDir); QFileInfo info(realDir);
if (!info.isAbsolute()) if (!info.isAbsolute()) {
info.setFile(m_projectDir + "/" + realDir);
realDir = m_projectDir + "/" + realDir; realDir = m_projectDir + "/" + realDir;
}
#ifdef QTEXTENDED_QBUILD_SUPPORT QString realFile;
// QBuild only uses project files named qbuild.pro, and subdirs are implied if (info.isDir()) {
if (m_isQBuildProject)
return qBuildSubDirsPaths(realDir);
#endif
if (info.suffix().isEmpty() || info.isDir()) {
realFile = QString("%1/%2.pro").arg(realDir, info.fileName()); realFile = QString("%1/%2.pro").arg(realDir, info.fileName());
if (!QFile::exists(realFile)) { if (!QFile::exists(realFile)) {
// parse directory for pro files - if there is only one, use that // parse directory for pro files - if there is only one, use that

1
src/plugins/qt4projectmanager/qt4nodes.h
View File

@@ -217,7 +217,6 @@ private:
Qt4ProjectType m_projectType; Qt4ProjectType m_projectType;
QHash<Qt4Variable, QStringList> m_varValues; QHash<Qt4Variable, QStringList> m_varValues;
bool m_isQBuildProject;
QTimer m_updateTimer; QTimer m_updateTimer;
QMap<QString, QDateTime> m_uitimestamps; QMap<QString, QDateTime> m_uitimestamps;