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

Do some more checks, maybe one of them is the reason for a crash.

Browse Source
This commit is contained in:
dt
2009-08-28 17:20:37 +02:00
parent 8a3e02a9e4
commit f862a034c0
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qt4projectmanager/profilereader.cpp
View File

@@ -46,7 +46,10 @@ ProFileReader::~ProFileReader()
}
void ProFileReader::setQtVersion(QtVersion *qtVersion) {
if (qtVersion)
m_option.properties = qtVersion->versionInfo();
else
m_option.properties.clear();
}
bool ProFileReader::readProFile(const QString &fileName)

4
src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
View File

@@ -146,8 +146,10 @@ void Qt4ProjectConfigWidget::updateDetails()
QString versionString;
if (m_pro->qtVersionId(m_buildConfiguration) == 0) {
versionString = tr("Default Qt Version (%1)").arg(version->name());
} else {
} else if(version){
versionString = version->name();
} else {
versionString = tr("No Qt Version set");
}
// Qt Version, Build Directory and Toolchain
m_ui->titleLabel->setText(tr("using Qt version: <b>%1</b><br>"

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

@@ -629,14 +629,20 @@ QString Qt4RunConfiguration::dumperLibrary() const
{
Qt4Project *pro = qobject_cast<Qt4Project *>(project());
QtVersion *version = pro->qtVersion(pro->activeBuildConfiguration());
if (version)
return version->debuggingHelperLibrary();
else
return QString::null;
}
QStringList Qt4RunConfiguration::dumperLibraryLocations() const
{
Qt4Project *pro = qobject_cast<Qt4Project *>(project());
QtVersion *version = pro->qtVersion(pro->activeBuildConfiguration());
return version->debuggingHelperLibraryLocations();;
if (version)
return version->debuggingHelperLibraryLocations();
else
return QStringList();
}
void Qt4RunConfiguration::setBaseEnvironmentBase(BaseEnvironmentBase env)