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
9dea7a39
Commit
9dea7a39
authored
May 16, 2011
by
dt
Browse files
Fix crash in QMakeStep::allArguments
qtVersion can be null now
parent
e3158d0e
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/plugins/qt4projectmanager/qmakestep.cpp
View file @
9dea7a39
...
...
@@ -137,10 +137,14 @@ QString QMakeStep::allArguments(bool shorted)
if
(
!
haveSpec
)
{
const
QString
tcSpec
=
bc
->
toolChain
()
?
bc
->
toolChain
()
->
mkspec
()
:
QString
();
if
(
!
tcSpec
.
isEmpty
()
&&
bc
->
qtVersion
()
->
hasMkspec
(
tcSpec
))
if
(
tcSpec
.
isEmpty
())
{
if
(
bc
->
qtVersion
())
arguments
<<
"-spec"
<<
bc
->
qtVersion
()
->
mkspec
();
}
else
if
(
!
bc
->
qtVersion
()
||
bc
->
qtVersion
()
->
hasMkspec
(
tcSpec
))
{
arguments
<<
"-spec"
<<
tcSpec
;
else
}
else
{
arguments
<<
"-spec"
<<
bc
->
qtVersion
()
->
mkspec
();
}
}
// Find out what flags we pass on to qmake
...
...
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