// update TargetInformation
m_qt4targetInformation = targetInformation(m_readerExact);
+ m_resolvedMkspecPath = m_project->proFileOption()->qmakespec;
setupInstallsList(m_readerExact);
setupProjectVersion(m_readerExact);
return m_qt4targetInformation;
}
+QString Qt4ProFileNode::resolvedMkspecPath() const
+{
+ return m_resolvedMkspecPath;
+}
+
void Qt4ProFileNode::setupInstallsList(const QtSupport::ProFileReader *reader)
{
m_installsList.clear();
QString makefile() const;
QStringList symbianCapabilities() const;
bool isDeployable() const;
+ QString resolvedMkspecPath() const;
void update();
void scheduleUpdate();
QMap<QString, QDateTime> m_uitimestamps;
TargetInformation m_qt4targetInformation;
+ QString m_resolvedMkspecPath;
InstallsList m_installsList;
ProjectVersion m_projectVersion;
friend class Qt4NodeHierarchy;
}
// Add mkspec directory
- if (activeBC->qtVersion())
+ if (rootQt4ProjectNode())
+ allIncludePaths.append(rootQt4ProjectNode()->resolvedMkspecPath());
+ else if (activeBC->qtVersion())
allIncludePaths.append(activeBC->qtVersion()->mkspecPath());
allIncludePaths.append(predefinedIncludePaths);
m_proFileOption->environment.insert(env.key(eit), env.value(eit));
QStringList args;
- if (QMakeStep *qs = bc->qmakeStep())
+ if (QMakeStep *qs = bc->qmakeStep()) {
args = qs->parserArguments();
- else
+ m_proFileOption->qmakespec = qs->mkspec();
+ } else {
args = bc->configCommandLineArguments();
+ }
m_proFileOption->setCommandLineArguments(args);
}
return reader;
}
+ProFileOption *Qt4Project::proFileOption()
+{
+ return m_proFileOption;
+}
+
void Qt4Project::destroyProFileReader(QtSupport::ProFileReader *reader)
{
delete reader;
/// \internal
QtSupport::ProFileReader *createProFileReader(Qt4ProFileNode *qt4ProFileNode, Qt4BuildConfiguration *bc = 0);
/// \internal
+ ProFileOption *proFileOption();
+ /// \internal
void destroyProFileReader(QtSupport::ProFileReader *reader);
/// \internal