Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Q
qt-creator
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Tobias Hunger
qt-creator
Commits
4b49d4f7
Commit
4b49d4f7
authored
Feb 24, 2011
by
Kai Koehne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
QtVersion: Rename 'debuggingHelper' to 'gdbDebuggingHelper'
Avoid confusion with other debugging helpers.
parent
8b5f742f
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
9 deletions
+9
-9
src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
...gins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
+1
-1
src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
...gins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
+1
-1
src/plugins/qt4projectmanager/qtoptionspage.cpp
src/plugins/qt4projectmanager/qtoptionspage.cpp
+3
-3
src/plugins/qt4projectmanager/qtversionmanager.cpp
src/plugins/qt4projectmanager/qtversionmanager.cpp
+2
-2
src/plugins/qt4projectmanager/qtversionmanager.h
src/plugins/qt4projectmanager/qtversionmanager.h
+2
-2
No files found.
src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
View file @
4b49d4f7
...
...
@@ -661,7 +661,7 @@ QString Qt4RunConfiguration::dumperLibrary() const
{
QtVersion
*
version
=
qt4Target
()
->
activeBuildConfiguration
()
->
qtVersion
();
if
(
version
)
return
version
->
d
ebuggingHelperLibrary
();
return
version
->
gdbD
ebuggingHelperLibrary
();
return
QString
();
}
...
...
src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
View file @
4b49d4f7
...
...
@@ -257,7 +257,7 @@ const QString MaemoRunConfiguration::arguments() const
const
QString
MaemoRunConfiguration
::
dumperLib
()
const
{
Qt4BuildConfiguration
*
qt4bc
(
activeQt4BuildConfiguration
());
return
qt4bc
->
qtVersion
()
->
d
ebuggingHelperLibrary
();
return
qt4bc
->
qtVersion
()
->
gdbD
ebuggingHelperLibrary
();
}
...
...
src/plugins/qt4projectmanager/qtoptionspage.cpp
View file @
4b49d4f7
...
...
@@ -289,7 +289,7 @@ void QtOptionsPageWidget::debuggingHelperBuildFinished(int qtVersionId, Debuggin
bool
success
=
true
;
if
(
tools
&
DebuggingHelperBuildTask
::
GdbDebugging
)
success
&=
qtVersion
->
hasDebuggingHelper
();
success
&=
qtVersion
->
has
Gdb
DebuggingHelper
();
if
(
tools
&
DebuggingHelperBuildTask
::
QmlDebugging
)
success
&=
qtVersion
->
hasQmlDebuggingLibrary
();
if
(
tools
&
DebuggingHelperBuildTask
::
QmlDump
)
...
...
@@ -452,7 +452,7 @@ void QtOptionsPageWidget::updateDebuggingHelperUi()
bool
canBuildQmlDebuggingLib
=
QmlDebuggingLibrary
::
canBuild
(
version
);
bool
canBuildQmlObserver
=
QmlObserverTool
::
canBuild
(
version
);
bool
hasGdbHelper
=
!
version
->
d
ebuggingHelperLibrary
().
isEmpty
();
bool
hasGdbHelper
=
!
version
->
gdbD
ebuggingHelperLibrary
().
isEmpty
();
bool
hasQmlDumper
=
version
->
hasQmlDump
();
bool
hasQmlDebuggingLib
=
version
->
hasQmlDebuggingLibrary
();
bool
hasQmlObserver
=
!
version
->
qmlObserverTool
().
isEmpty
();
...
...
@@ -495,7 +495,7 @@ void QtOptionsPageWidget::updateDebuggingHelperUi()
QString
gdbHelperText
;
Qt
::
TextInteractionFlags
gdbHelperTextFlags
=
Qt
::
NoTextInteraction
;
if
(
hasGdbHelper
)
{
gdbHelperText
=
QDir
::
toNativeSeparators
(
version
->
d
ebuggingHelperLibrary
());
gdbHelperText
=
QDir
::
toNativeSeparators
(
version
->
gdbD
ebuggingHelperLibrary
());
gdbHelperTextFlags
=
Qt
::
TextSelectableByMouse
;
}
else
{
gdbHelperText
=
tr
(
"<i>Not yet built.</i>"
);
...
...
src/plugins/qt4projectmanager/qtversionmanager.cpp
View file @
4b49d4f7
...
...
@@ -1777,7 +1777,7 @@ QtVersion::QmakeBuildConfigs QtVersion::defaultBuildConfig() const
return
result
;
}
bool
QtVersion
::
hasDebuggingHelper
()
const
bool
QtVersion
::
has
Gdb
DebuggingHelper
()
const
{
updateVersionInfo
();
return
m_hasDebuggingHelper
;
...
...
@@ -1817,7 +1817,7 @@ Utils::Environment QtVersion::qmlToolsEnvironment() const
return
environment
;
}
QString
QtVersion
::
d
ebuggingHelperLibrary
()
const
QString
QtVersion
::
gdbD
ebuggingHelperLibrary
()
const
{
QString
qtInstallData
=
versionInfo
().
value
(
"QT_INSTALL_DATA"
);
if
(
qtInstallData
.
isEmpty
())
...
...
src/plugins/qt4projectmanager/qtversionmanager.h
View file @
4b49d4f7
...
...
@@ -139,13 +139,13 @@ public:
QList
<
ProjectExplorer
::
HeaderPath
>
systemHeaderPathes
()
const
;
bool
supportsBinaryDebuggingHelper
()
const
;
bool
hasDebuggingHelper
()
const
;
QString
debuggingHelperLibrary
()
const
;
QString
gdbDebuggingHelperLibrary
()
const
;
QString
qmlDebuggingHelperLibrary
(
bool
debugVersion
)
const
;
QString
qmlDumpTool
(
bool
debugVersion
)
const
;
QString
qmlObserverTool
()
const
;
QStringList
debuggingHelperLibraryLocations
()
const
;
bool
hasGdbDebuggingHelper
()
const
;
bool
hasQmlDump
()
const
;
bool
hasQmlDebuggingLibrary
()
const
;
bool
hasQmlObserver
()
const
;
...
...
Write
Preview
Markdown
is supported
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