Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
flatpak-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
Marco Bubke
flatpak-qt-creator
Commits
2af168e1
Commit
2af168e1
authored
14 years ago
by
Tobias Hunger
Browse files
Options
Downloads
Patches
Plain Diff
Do not try to build in Qt4 makestep without a tool chain
Reviewed-by: dt
parent
3664d205
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/plugins/qt4projectmanager/makestep.cpp
+23
-0
23 additions, 0 deletions
src/plugins/qt4projectmanager/makestep.cpp
src/plugins/qt4projectmanager/makestep.h
+2
-0
2 additions, 0 deletions
src/plugins/qt4projectmanager/makestep.h
with
25 additions
and
0 deletions
src/plugins/qt4projectmanager/makestep.cpp
+
23
−
0
View file @
2af168e1
...
...
@@ -43,6 +43,7 @@
#include
<projectexplorer/toolchain.h>
#include
<projectexplorer/buildsteplist.h>
#include
<projectexplorer/projectexplorer.h>
#include
<projectexplorer/projectexplorerconstants.h>
#include
<extensionsystem/pluginmanager.h>
#include
<utils/qtcprocess.h>
...
...
@@ -129,6 +130,14 @@ bool MakeStep::fromMap(const QVariantMap &map)
bool
MakeStep
::
init
()
{
Qt4BuildConfiguration
*
bc
=
qt4BuildConfiguration
();
if
(
!
bc
->
toolChain
())
{
m_tasks
.
append
(
ProjectExplorer
::
Task
(
ProjectExplorer
::
Task
::
Error
,
tr
(
"Qt Creator needs a tool chain set up to build. Please configure a tool chain in Project mode."
),
QString
(),
-
1
,
QLatin1String
(
ProjectExplorer
::
Constants
::
TASK_CATEGORY_BUILDSYSTEM
)));
}
ProjectExplorer
::
ProcessParameters
*
pp
=
processParameters
();
pp
->
setMacroExpander
(
bc
->
macroExpander
());
...
...
@@ -205,6 +214,20 @@ void MakeStep::run(QFutureInterface<bool> & fi)
return
;
}
// Warn on common error conditions:
bool
canContinue
=
true
;
foreach
(
const
ProjectExplorer
::
Task
&
t
,
m_tasks
)
{
addTask
(
t
);
if
(
t
.
type
==
ProjectExplorer
::
Task
::
Error
)
canContinue
=
false
;
}
if
(
!
canContinue
)
{
emit
addOutput
(
tr
(
"Configuration is faulty, please check the Build Issues view for details."
),
BuildStep
::
MessageOutput
);
fi
.
reportResult
(
false
);
return
;
}
AbstractProcessStep
::
run
(
fi
);
}
...
...
This diff is collapsed.
Click to expand it.
src/plugins/qt4projectmanager/makestep.h
+
2
−
0
View file @
2af168e1
...
...
@@ -36,6 +36,7 @@
#include
<projectexplorer/abstractprocessstep.h>
#include
<projectexplorer/buildstep.h>
#include
<projectexplorer/task.h>
QT_BEGIN_NAMESPACE
namespace
Ui
{
...
...
@@ -116,6 +117,7 @@ private:
bool
m_clean
;
QString
m_userArgs
;
QString
m_makeCmd
;
QList
<
ProjectExplorer
::
Task
>
m_tasks
;
};
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