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
Tobias Hunger
qt-creator
Commits
3ec173bf
Commit
3ec173bf
authored
Dec 09, 2010
by
Tobias Hunger
Browse files
Qt4: Simplify makestep
* Remove unnecessary member variable.
parent
88b77ba8
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/plugins/qt4projectmanager/makestep.cpp
View file @
3ec173bf
...
...
@@ -180,14 +180,15 @@ bool MakeStep::init()
setEnabled
(
true
);
pp
->
setArguments
(
args
);
m_makeParser
=
bc
->
qtVersion
()
->
createOutputParser
();
m_makeParser
->
appendOutputParser
(
new
QtParser
);
ProjectExplorer
::
IOutputParser
*
parser
=
bc
->
qtVersion
()
->
createOutputParser
();
Q_ASSERT
(
parser
);
parser
->
appendOutputParser
(
new
QtParser
);
if
(
toolchain
)
m_makeP
arser
->
appendOutputParser
(
toolchain
->
outputParser
());
p
arser
->
appendOutputParser
(
toolchain
->
outputParser
());
m_makeP
arser
->
setWorkingDirectory
(
workingDirectory
);
p
arser
->
setWorkingDirectory
(
workingDirectory
);
setOutputParser
(
m_makeP
arser
);
setOutputParser
(
p
arser
);
return
AbstractProcessStep
::
init
();
}
...
...
@@ -205,7 +206,7 @@ void MakeStep::run(QFutureInterface<bool> & fi)
bool
MakeStep
::
processSucceeded
(
int
exitCode
,
QProcess
::
ExitStatus
status
)
{
// Symbian does retun 0, even on failed makes! So we check for fatal make errors here.
if
(
m_make
Parser
&&
m_make
Parser
->
hasFatalErrors
())
if
(
output
Parser
()
&&
output
Parser
()
->
hasFatalErrors
())
return
false
;
return
AbstractProcessStep
::
processSucceeded
(
exitCode
,
status
);
...
...
src/plugins/qt4projectmanager/makestep.h
View file @
3ec173bf
...
...
@@ -111,7 +111,6 @@ private:
bool
m_clean
;
QString
m_userArgs
;
QString
m_makeCmd
;
ProjectExplorer
::
IOutputParser
*
m_makeParser
;
};
class
MakeStepConfigWidget
:
public
ProjectExplorer
::
BuildStepConfigWidget
...
...
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