forked from qt-creator/qt-creator
Do some more checks, maybe one of them is the reason for a crash.
This commit is contained in:
@@ -46,7 +46,10 @@ ProFileReader::~ProFileReader()
|
|||||||
}
|
}
|
||||||
|
|
||||||
void ProFileReader::setQtVersion(QtVersion *qtVersion) {
|
void ProFileReader::setQtVersion(QtVersion *qtVersion) {
|
||||||
|
if (qtVersion)
|
||||||
m_option.properties = qtVersion->versionInfo();
|
m_option.properties = qtVersion->versionInfo();
|
||||||
|
else
|
||||||
|
m_option.properties.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool ProFileReader::readProFile(const QString &fileName)
|
bool ProFileReader::readProFile(const QString &fileName)
|
||||||
|
@@ -146,8 +146,10 @@ void Qt4ProjectConfigWidget::updateDetails()
|
|||||||
QString versionString;
|
QString versionString;
|
||||||
if (m_pro->qtVersionId(m_buildConfiguration) == 0) {
|
if (m_pro->qtVersionId(m_buildConfiguration) == 0) {
|
||||||
versionString = tr("Default Qt Version (%1)").arg(version->name());
|
versionString = tr("Default Qt Version (%1)").arg(version->name());
|
||||||
} else {
|
} else if(version){
|
||||||
versionString = version->name();
|
versionString = version->name();
|
||||||
|
} else {
|
||||||
|
versionString = tr("No Qt Version set");
|
||||||
}
|
}
|
||||||
// Qt Version, Build Directory and Toolchain
|
// Qt Version, Build Directory and Toolchain
|
||||||
m_ui->titleLabel->setText(tr("using Qt version: <b>%1</b><br>"
|
m_ui->titleLabel->setText(tr("using Qt version: <b>%1</b><br>"
|
||||||
|
@@ -629,14 +629,20 @@ QString Qt4RunConfiguration::dumperLibrary() const
|
|||||||
{
|
{
|
||||||
Qt4Project *pro = qobject_cast<Qt4Project *>(project());
|
Qt4Project *pro = qobject_cast<Qt4Project *>(project());
|
||||||
QtVersion *version = pro->qtVersion(pro->activeBuildConfiguration());
|
QtVersion *version = pro->qtVersion(pro->activeBuildConfiguration());
|
||||||
|
if (version)
|
||||||
return version->debuggingHelperLibrary();
|
return version->debuggingHelperLibrary();
|
||||||
|
else
|
||||||
|
return QString::null;
|
||||||
}
|
}
|
||||||
|
|
||||||
QStringList Qt4RunConfiguration::dumperLibraryLocations() const
|
QStringList Qt4RunConfiguration::dumperLibraryLocations() const
|
||||||
{
|
{
|
||||||
Qt4Project *pro = qobject_cast<Qt4Project *>(project());
|
Qt4Project *pro = qobject_cast<Qt4Project *>(project());
|
||||||
QtVersion *version = pro->qtVersion(pro->activeBuildConfiguration());
|
QtVersion *version = pro->qtVersion(pro->activeBuildConfiguration());
|
||||||
return version->debuggingHelperLibraryLocations();;
|
if (version)
|
||||||
|
return version->debuggingHelperLibraryLocations();
|
||||||
|
else
|
||||||
|
return QStringList();
|
||||||
}
|
}
|
||||||
|
|
||||||
void Qt4RunConfiguration::setBaseEnvironmentBase(BaseEnvironmentBase env)
|
void Qt4RunConfiguration::setBaseEnvironmentBase(BaseEnvironmentBase env)
|
||||||
|
Reference in New Issue
Block a user