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
9ab11269
Commit
9ab11269
authored
16 years ago
by
dt
Browse files
Options
Downloads
Patches
Plain Diff
Fixes: Noisy debugt output from gdbmacrosbuildstep.cpp
parent
6d7c9cb8
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/plugins/qt4projectmanager/gdbmacrosbuildstep.cpp
+1
-6
1 addition, 6 deletions
src/plugins/qt4projectmanager/gdbmacrosbuildstep.cpp
with
1 addition
and
6 deletions
src/plugins/qt4projectmanager/gdbmacrosbuildstep.cpp
+
1
−
6
View file @
9ab11269
...
@@ -57,8 +57,6 @@ bool GdbMacrosBuildStep::init(const QString &buildConfiguration)
...
@@ -57,8 +57,6 @@ bool GdbMacrosBuildStep::init(const QString &buildConfiguration)
m_buildDirectory
=
m_project
->
buildDirectory
(
buildConfiguration
);
m_buildDirectory
=
m_project
->
buildDirectory
(
buildConfiguration
);
m_qmake
=
m_project
->
qtVersion
(
buildConfiguration
)
->
qmakeCommand
();
m_qmake
=
m_project
->
qtVersion
(
buildConfiguration
)
->
qmakeCommand
();
m_buildConfiguration
=
buildConfiguration
;
m_buildConfiguration
=
buildConfiguration
;
qDebug
()
<<
"m_buildDirectory "
<<
m_buildDirectory
;
qDebug
()
<<
"m_qmake "
<<
m_qmake
;
return
true
;
return
true
;
}
}
...
@@ -81,7 +79,6 @@ void GdbMacrosBuildStep::run(QFutureInterface<bool> & fi)
...
@@ -81,7 +79,6 @@ void GdbMacrosBuildStep::run(QFutureInterface<bool> & fi)
if
(
destination
.
exists
())
if
(
destination
.
exists
())
destination
.
remove
();
destination
.
remove
();
QFile
::
copy
(
dumperPath
+
file
,
destDir
+
file
);
QFile
::
copy
(
dumperPath
+
file
,
destDir
+
file
);
qDebug
()
<<
"copying"
<<
(
dumperPath
+
file
)
<<
" to "
<<
(
destDir
+
file
);
}
}
Qt4Project
*
qt4Project
=
static_cast
<
Qt4Project
*>
(
project
());
Qt4Project
*
qt4Project
=
static_cast
<
Qt4Project
*>
(
project
());
...
@@ -112,7 +109,6 @@ void GdbMacrosBuildStep::run(QFutureInterface<bool> & fi)
...
@@ -112,7 +109,6 @@ void GdbMacrosBuildStep::run(QFutureInterface<bool> & fi)
}
else
{
}
else
{
// Old style with CONFIG+=debug_and_release
// Old style with CONFIG+=debug_and_release
qDebug
()
<<
"OLD STYLE CONF"
;
configarguments
<<
"CONFIG+=debug_and_release"
;
configarguments
<<
"CONFIG+=debug_and_release"
;
const
MakeStep
*
ms
=
qt4Project
->
makeStep
();
const
MakeStep
*
ms
=
qt4Project
->
makeStep
();
QStringList
makeargs
=
ms
->
value
(
m_buildConfiguration
,
"makeargs"
).
toStringList
();
QStringList
makeargs
=
ms
->
value
(
m_buildConfiguration
,
"makeargs"
).
toStringList
();
...
@@ -126,11 +122,10 @@ void GdbMacrosBuildStep::run(QFutureInterface<bool> & fi)
...
@@ -126,11 +122,10 @@ void GdbMacrosBuildStep::run(QFutureInterface<bool> & fi)
QString
mkspec
=
qt4Project
->
qtVersion
(
m_buildConfiguration
)
->
mkspec
();
QString
mkspec
=
qt4Project
->
qtVersion
(
m_buildConfiguration
)
->
mkspec
();
qmake
.
start
(
m_qmake
,
QStringList
()
<<
"-spec"
<<
mkspec
<<
configarguments
<<
"gdbmacros.pro"
);
qmake
.
start
(
m_qmake
,
QStringList
()
<<
"-spec"
<<
mkspec
<<
configarguments
<<
"gdbmacros.pro"
);
qmake
.
waitForFinished
();
qmake
.
waitForFinished
();
qDebug
()
<<
qmake
.
readAllStandardError
()
<<
qmake
.
readAllStandardOutput
();
qmake
.
start
(
qt4Project
->
qtVersion
(
m_buildConfiguration
)
->
makeCommand
(),
makeArguments
);
qmake
.
start
(
qt4Project
->
qtVersion
(
m_buildConfiguration
)
->
makeCommand
(),
makeArguments
);
qmake
.
waitForFinished
();
qmake
.
waitForFinished
();
qDebug
()
<<
qmake
.
readAllStandardError
()
<<
qmake
.
readAllStandardOutput
();
fi
.
reportResult
(
true
);
fi
.
reportResult
(
true
);
}
}
...
...
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