Commit 444a0b0e authored by con's avatar con
Browse files

Fixes: subdir.file not supported

Task:     247566
RevBy:    dt
parent 48f90a66
......@@ -904,12 +904,18 @@ QStringList Qt4ProFileNode::subDirsPaths(ProFileReader *reader) const
// Special case were subdir is just an identifier:
// "SUBDIR = subid
// subid.subdir = realdir"
// or
// "SUBDIR = subid
// subid.file = realdir/realfile.pro"
QString realDir;
QString realFile;
const QString subDirKey = subDirVar + QLatin1String(".subdir");
const QString subDirFileKey = subDirVar + QLatin1String(".file");
if (reader->contains(subDirKey))
realDir = QFileInfo(reader->value(subDirKey)).filePath();
else if (reader->contains(subDirFileKey))
realDir = QFileInfo(reader->value(subDirFileKey)).filePath();
else
realDir = subDirVar;
QFileInfo info(realDir);
......
......@@ -130,13 +130,6 @@ QString Qt4Manager::mimeType() const
ProjectExplorer::Project* Qt4Manager::openProject(const QString &fileName)
{
typedef QMultiMap<QString, QString> DependencyMap;
const QString dotSubDir = QLatin1String(".subdir");
const QString dotDepends = QLatin1String(".depends");
const QChar slash = QLatin1Char('/');
QString errorMessage;
Core::MessageManager *messageManager = Core::ICore::instance()->messageManager();
messageManager->displayStatusBarMessage(tr("Loading project %1 ...").arg(fileName), 50000);
......
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