Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
f862a034
Commit
f862a034
authored
Aug 28, 2009
by
dt
Browse files
Do some more checks, maybe one of them is the reason for a crash.
parent
8a3e02a9
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/plugins/qt4projectmanager/profilereader.cpp
View file @
f862a034
...
...
@@ -46,7 +46,10 @@ ProFileReader::~ProFileReader()
}
void
ProFileReader
::
setQtVersion
(
QtVersion
*
qtVersion
)
{
m_option
.
properties
=
qtVersion
->
versionInfo
();
if
(
qtVersion
)
m_option
.
properties
=
qtVersion
->
versionInfo
();
else
m_option
.
properties
.
clear
();
}
bool
ProFileReader
::
readProFile
(
const
QString
&
fileName
)
...
...
src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
View file @
f862a034
...
...
@@ -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>"
...
...
src/plugins/qt4projectmanager/qt4runconfiguration.cpp
View file @
f862a034
...
...
@@ -629,14 +629,20 @@ QString Qt4RunConfiguration::dumperLibrary() const
{
Qt4Project
*
pro
=
qobject_cast
<
Qt4Project
*>
(
project
());
QtVersion
*
version
=
pro
->
qtVersion
(
pro
->
activeBuildConfiguration
());
return
version
->
debuggingHelperLibrary
();
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
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment