Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Q
qt-creator
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Tobias Hunger
qt-creator
Commits
3ec173bf
Commit
3ec173bf
authored
14 years ago
by
Tobias Hunger
Browse files
Options
Downloads
Patches
Plain Diff
Qt4: Simplify makestep
* Remove unnecessary member variable.
parent
88b77ba8
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/plugins/qt4projectmanager/makestep.cpp
+7
-6
7 additions, 6 deletions
src/plugins/qt4projectmanager/makestep.cpp
src/plugins/qt4projectmanager/makestep.h
+0
-1
0 additions, 1 deletion
src/plugins/qt4projectmanager/makestep.h
with
7 additions
and
7 deletions
src/plugins/qt4projectmanager/makestep.cpp
+
7
−
6
View file @
3ec173bf
...
@@ -180,14 +180,15 @@ bool MakeStep::init()
...
@@ -180,14 +180,15 @@ bool MakeStep::init()
setEnabled
(
true
);
setEnabled
(
true
);
pp
->
setArguments
(
args
);
pp
->
setArguments
(
args
);
m_makeParser
=
bc
->
qtVersion
()
->
createOutputParser
();
ProjectExplorer
::
IOutputParser
*
parser
=
bc
->
qtVersion
()
->
createOutputParser
();
m_makeParser
->
appendOutputParser
(
new
QtParser
);
Q_ASSERT
(
parser
);
parser
->
appendOutputParser
(
new
QtParser
);
if
(
toolchain
)
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
();
return
AbstractProcessStep
::
init
();
}
}
...
@@ -205,7 +206,7 @@ void MakeStep::run(QFutureInterface<bool> & fi)
...
@@ -205,7 +206,7 @@ void MakeStep::run(QFutureInterface<bool> & fi)
bool
MakeStep
::
processSucceeded
(
int
exitCode
,
QProcess
::
ExitStatus
status
)
bool
MakeStep
::
processSucceeded
(
int
exitCode
,
QProcess
::
ExitStatus
status
)
{
{
// Symbian does retun 0, even on failed makes! So we check for fatal make errors here.
// 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
false
;
return
AbstractProcessStep
::
processSucceeded
(
exitCode
,
status
);
return
AbstractProcessStep
::
processSucceeded
(
exitCode
,
status
);
...
...
This diff is collapsed.
Click to expand it.
src/plugins/qt4projectmanager/makestep.h
+
0
−
1
View file @
3ec173bf
...
@@ -111,7 +111,6 @@ private:
...
@@ -111,7 +111,6 @@ private:
bool
m_clean
;
bool
m_clean
;
QString
m_userArgs
;
QString
m_userArgs
;
QString
m_makeCmd
;
QString
m_makeCmd
;
ProjectExplorer
::
IOutputParser
*
m_makeParser
;
};
};
class
MakeStepConfigWidget
:
public
ProjectExplorer
::
BuildStepConfigWidget
class
MakeStepConfigWidget
:
public
ProjectExplorer
::
BuildStepConfigWidget
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment