diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp index 3875d3c1115908e3e9b45b3f38e7ced367ddadf0..2444c6d9ebb6782777233c6c882924c3ee91361e 100644 --- a/src/plugins/qt4projectmanager/qt4nodes.cpp +++ b/src/plugins/qt4projectmanager/qt4nodes.cpp @@ -1196,29 +1196,6 @@ QStringList Qt4ProFileNode::subDirsPaths(ProFileReader *reader) const return subProjectPaths; } -QStringList Qt4ProFileNode::qBuildSubDirsPaths(const QString &scanDir) const -{ - QStringList subProjectPaths; - - // With QBuild we only look for project files named qbuild.pro - QString realFile = scanDir + "/qbuild.pro"; - if (QFile::exists(realFile)) - subProjectPaths << realFile; - - // With QBuild 'subdirs' are implied - QDir dir(scanDir); - QStringList subDirs = dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot); - foreach (QString subDir, subDirs) { - // 'tests' sub directories are an exception to the 'QBuild scans everything' rule. - // Tests are only build with the 'make test' command, in which case QBuild WILL look - // for a tests subdir and run everything in there. - if (subDir != "tests") - subProjectPaths += qBuildSubDirsPaths(scanDir + "/" + subDir); - } - - return subProjectPaths; -} - QString Qt4PriFileNode::buildDir() const { const QDir srcDirRoot = QFileInfo(m_project->rootProjectNode()->path()).absoluteDir(); diff --git a/src/plugins/qt4projectmanager/qt4nodes.h b/src/plugins/qt4projectmanager/qt4nodes.h index fee79ea4ee2df37c3aa9f2c86ff39e3df5059bd5..ecc32cddc3e93f2392bdde004aadf7d528a26fea 100644 --- a/src/plugins/qt4projectmanager/qt4nodes.h +++ b/src/plugins/qt4projectmanager/qt4nodes.h @@ -213,7 +213,6 @@ private: QStringList mocDirPaths(ProFileReader *reader) const; QStringList includePaths(ProFileReader *reader) const; QStringList subDirsPaths(ProFileReader *reader) const; - QStringList qBuildSubDirsPaths(const QString &scanDir) const; void invalidate();