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

Merge commit '2be0845c7492ad991f23ce5c90c322df788b62b5'

Browse Source 
Conflicts:
	src/plugins/projectexplorer/projectexplorer.h
	src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
	src/plugins/qt4projectmanager/qt4runconfiguration.cpp
	src/plugins/qt4projectmanager/qtversionmanager.cpp
This commit is contained in:
con
2009-10-29 18:54:17 +01:00
parent c1413ffa8a 2be0845c74
commit be3fafc311
82 changed files with 6357 additions and 4053 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/qt4projectmanager/qt4project.cpp
View File

@@ -274,18 +274,19 @@ bool Qt4BuildConfigurationFactory::create(const QString &type) const
{
QTC_ASSERT(m_versions.contains(type), return false);
const VersionInfo &info = m_versions.value(type);
QtVersion *version = QtVersionManager::instance()->version(info.versionId);
if (!version)
return false;
bool ok;
QString buildConfigurationName = QInputDialog::getText(0,
tr("New configuration"),
tr("New Configuration Name:"),
QLineEdit::Normal,
QString(),
version->name(),
&ok);
if (!ok || buildConfigurationName.isEmpty())
return false;
QtVersion *version = QtVersionManager::instance()->version(info.versionId);
m_project->addQt4BuildConfiguration(tr("%1 Debug").arg(buildConfigurationName),
version,
(QtVersion::QmakeBuildConfig)(version->defaultBuildConfig() | QtVersion::DebugBuild));
@@ -983,17 +984,8 @@ void Qt4Project::setToolChainType(BuildConfiguration *configuration, ProjectExpl
void Qt4Project::updateActiveRunConfiguration()
{
const QSharedPointer<RunConfiguration> activeRunConfig = activeRunConfiguration();
if (!activeRunConfig.isNull() && !activeRunConfig->isEnabled()) {
foreach (const QSharedPointer<RunConfiguration> &runConfiguration, runConfigurations()) {
if (runConfiguration->isEnabled()) {
setActiveRunConfiguration(runConfiguration);
break;
}
}
}
emit runConfigurationsEnabledStateChanged();
emit invalidateCachedTargetInformation();
emit targetInformationChanged();
}
ProjectExplorer::ToolChain::ToolChainType Qt4Project::toolChainType(BuildConfiguration *configuration) const
@@ -1195,6 +1187,11 @@ void Qt4Project::invalidateCachedTargetInformation()
emit targetInformationChanged();
}
void Qt4Project::emitBuildDirectoryChanged()
{
emit buildDirectoryChanged();
}
// We match -spec and -platfrom separetly
// We ignore -cache, because qmake contained a bug that it didn't
// mention the -cache in the Makefile