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

Qt4PM: Parse object extension and objects dir

Browse Source 
Task-number: QTCREATORBUG-106

Change-Id: I01682bbcf19dbe26cc8325fa9ed5999b7f2fe15e
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
Orgad Shaneh
2012-04-28 22:24:33 +03:00
committed by Oswald Buddenhagen
parent 70bda7c3ba
commit 2c1c89fa35
2 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1424,6 +1424,25 @@ QStringList Qt4ProFileNode::symbianCapabilities() const
return result; return result;
} }
QString Qt4ProFileNode::objectExtension() const
{
if (m_varValues[ObjectExt].isEmpty()) {
#ifdef Q_OS_WIN
return QLatin1String(".obj");
#else
return QLatin1String(".o");
#endif
}
return m_varValues[ObjectExt].first();
}
QString Qt4ProFileNode::objectsDirectory() const
{
if (m_varValues[ObjectsDir].isEmpty())
return buildDir();
return m_varValues[ObjectsDir].first();
}
QByteArray Qt4ProFileNode::cxxDefines() const QByteArray Qt4ProFileNode::cxxDefines() const
{ {
QByteArray result; QByteArray result;
@@ -1883,6 +1902,8 @@ void Qt4ProFileNode::applyEvaluate(EvalResult evalResult, bool async)
newVarValues[Makefile] = m_readerExact->values(QLatin1String("MAKEFILE")); newVarValues[Makefile] = m_readerExact->values(QLatin1String("MAKEFILE"));
newVarValues[SymbianCapabilities] = m_readerExact->values(QLatin1String("TARGET.CAPABILITY")); newVarValues[SymbianCapabilities] = m_readerExact->values(QLatin1String("TARGET.CAPABILITY"));
newVarValues[QtVar] = m_readerExact->values(QLatin1String("QT")); newVarValues[QtVar] = m_readerExact->values(QLatin1String("QT"));
newVarValues[ObjectExt] = m_readerExact->values(QLatin1String("QMAKE_EXT_OBJ"));
newVarValues[ObjectsDir] = m_readerExact->values(QLatin1String("OBJECTS_DIR"));
m_isDeployable = false; m_isDeployable = false;
if (m_projectType == ApplicationTemplate) { if (m_projectType == ApplicationTemplate) {

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

@@ -95,7 +95,9 @@ enum Qt4Variable {
QtVar, QtVar,
QmlImportPathVar, QmlImportPathVar,
Makefile, Makefile,
SymbianCapabilities SymbianCapabilities,
ObjectExt,
ObjectsDir
}; };
// Import base classes into namespace // Import base classes into namespace
@@ -358,6 +360,8 @@ public:
QString makefile() const; QString makefile() const;
QStringList symbianCapabilities() const; QStringList symbianCapabilities() const;
QString objectExtension() const;
QString objectsDirectory() const;
QByteArray cxxDefines() const; QByteArray cxxDefines() const;
bool isDeployable() const; bool isDeployable() const;
QString resolvedMkspecPath() const; QString resolvedMkspecPath() const;