From 444a0b0e1e23fcd80297f547bb28280f91c0afb5 Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Thu, 12 Mar 2009 14:57:37 +0100
Subject: [PATCH] Fixes: subdir.file not supported
Task: 247566
RevBy: dt
---
src/plugins/qt4projectmanager/qt4nodes.cpp | 8 +++++++-
src/plugins/qt4projectmanager/qt4projectmanager.cpp | 7 -------
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp
index 1a33bbf2152..e2a9ea8d9d2 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.cpp
+++ b/src/plugins/qt4projectmanager/qt4nodes.cpp
@@ -904,13 +904,19 @@ 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
+ else if (reader->contains(subDirFileKey))
+ realDir = QFileInfo(reader->value(subDirFileKey)).filePath();
+ else
realDir = subDirVar;
QFileInfo info(realDir);
if (!info.isAbsolute())
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.cpp b/src/plugins/qt4projectmanager/qt4projectmanager.cpp
index e22f19278f5..df1d613dc30 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager.cpp
+++ b/src/plugins/qt4projectmanager/qt4projectmanager.cpp
@@ -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);
--
GitLab