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

Fix "TARGET=" in .pro files

Browse Source 
Default to the baseName() of the .pro file.
This commit is contained in:
dt
2009-08-13 17:18:18 +02:00
parent b104b43fa0
commit 39913b3216
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
View File

@@ -221,6 +221,9 @@ void S60DeviceRunConfiguration::updateTarget()
} }
m_targetName = reader->value("TARGET"); m_targetName = reader->value("TARGET");
if (m_targetName.isEmpty())
m_targetName = QFileInfo(m_proFilePath).baseName();
m_baseFileName = QDir::cleanPath(m_workingDir + QLatin1Char('/') + m_targetName); m_baseFileName = QDir::cleanPath(m_workingDir + QLatin1Char('/') + m_targetName);
if (pro->toolChainType(pro->activeBuildConfiguration()) == ToolChain::GCCE) if (pro->toolChainType(pro->activeBuildConfiguration()) == ToolChain::GCCE)

6
src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp
View File

@@ -149,8 +149,12 @@ void S60EmulatorRunConfiguration::updateTarget()
qmakeBuildConfig = "udeb"; qmakeBuildConfig = "udeb";
baseDir += "/epoc32/release/winscw/" + qmakeBuildConfig; baseDir += "/epoc32/release/winscw/" + qmakeBuildConfig;
QString target = reader->value("TARGET");
if (target.isEmpty())
target = QFileInfo(m_proFilePath).baseName();
m_executable = QDir::toNativeSeparators( m_executable = QDir::toNativeSeparators(
QDir::cleanPath(baseDir + QLatin1Char('/') + reader->value("TARGET"))); QDir::cleanPath(baseDir + QLatin1Char('/') + target));
m_executable += QLatin1String(".exe"); m_executable += QLatin1String(".exe");
delete reader; delete reader;

8
src/plugins/qt4projectmanager/qt4runconfiguration.cpp
View File

@@ -592,16 +592,20 @@ void Qt4RunConfiguration::updateTarget()
} }
} }
QString target = reader->value("TARGET");
if (target.isEmpty())
target = QFileInfo(m_proFilePath).baseName();
#if defined (Q_OS_MAC) #if defined (Q_OS_MAC)
if (reader->values("CONFIG").contains("app_bundle")) { if (reader->values("CONFIG").contains("app_bundle")) {
m_workingDir += QLatin1Char('/') m_workingDir += QLatin1Char('/')
+ reader->value("TARGET") + target
+ QLatin1String(".app/Contents/MacOS"); + QLatin1String(".app/Contents/MacOS");
} }
#endif #endif
m_workingDir = QDir::cleanPath(m_workingDir); m_workingDir = QDir::cleanPath(m_workingDir);
m_executable = QDir::cleanPath(m_workingDir + QLatin1Char('/') + reader->value("TARGET")); m_executable = QDir::cleanPath(m_workingDir + QLatin1Char('/') + target);
//qDebug()<<"##### updateTarget sets:"<<m_workingDir<<m_executable; //qDebug()<<"##### updateTarget sets:"<<m_workingDir<<m_executable;
#if defined (Q_OS_WIN) #if defined (Q_OS_WIN)