Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
fa68a545
Commit
fa68a545
authored
Aug 20, 2010
by
Pawel Polanski
Browse files
Executable's UID added to the DebuggerStartParameters. Used for debugging on SymbianOs
parent
6bf5f734
Changes
5
Hide whitespace changes
Inline
Side-by-side
src/plugins/debugger/debuggerengine.cpp
View file @
fa68a545
...
...
@@ -110,7 +110,8 @@ DebuggerStartParameters::DebuggerStartParameters()
useTerminal
(
false
),
breakAtMain
(
false
),
toolChainType
(
ToolChain
::
UNKNOWN
),
startMode
(
NoStartMode
)
startMode
(
NoStartMode
),
executableUid
(
0
)
{}
void
DebuggerStartParameters
::
clear
()
...
...
src/plugins/debugger/debuggerengine.h
View file @
fa68a545
...
...
@@ -99,6 +99,9 @@ public:
QString
dumperLibrary
;
QStringList
dumperLibraryLocations
;
DebuggerStartMode
startMode
;
// for SymbianOS debugging
quint32
executableUid
;
};
DEBUGGER_EXPORT
QDebug
operator
<<
(
QDebug
str
,
const
DebuggerStartParameters
&
);
...
...
src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp
View file @
fa68a545
...
...
@@ -252,6 +252,27 @@ QString S60DeployConfiguration::localExecutableFileName() const
return
QDir
::
toNativeSeparators
(
localExecutable
);
}
quint32
S60DeployConfiguration
::
executableUid
()
const
{
quint32
uid
=
0
;
QString
executablePath
(
localExecutableFileName
());
if
(
!
executablePath
.
isEmpty
())
{
QFile
file
(
executablePath
);
if
(
file
.
open
(
QIODevice
::
ReadOnly
))
{
// executable's UID is 4 bytes starting at 8.
const
QByteArray
data
=
file
.
read
(
12
);
if
(
data
.
size
()
==
12
)
{
const
unsigned
char
*
d
=
reinterpret_cast
<
const
unsigned
char
*>
(
data
.
data
()
+
8
);
uid
=
*
d
++
;
uid
+=
*
d
++
<<
8
;
uid
+=
*
d
++
<<
16
;
uid
+=
*
d
++
<<
24
;
}
}
}
return
uid
;
}
bool
S60DeployConfiguration
::
runSmartInstaller
()
const
{
DeployConfiguration
*
dc
=
target
()
->
activeDeployConfiguration
();
...
...
src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.h
View file @
fa68a545
...
...
@@ -77,6 +77,7 @@ public:
QStringList
packageTemplateFileNames
()
const
;
QString
appPackageTemplateFileName
()
const
;
QString
localExecutableFileName
()
const
;
quint32
executableUid
()
const
;
QVariantMap
toMap
()
const
;
...
...
src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
View file @
fa68a545
...
...
@@ -593,6 +593,9 @@ S60DeviceDebugRunControl::S60DeviceDebugRunControl(S60DeviceRunConfiguration *rc
m_startParams
->
startMode
=
Debugger
::
StartInternal
;
m_startParams
->
toolChainType
=
rc
->
toolChainType
();
m_startParams
->
executable
=
debugFileName
;
m_startParams
->
executableUid
=
activeDeployConf
->
executableUid
();
QTC_ASSERT
(
m_startParams
->
executableUid
,
return
);
// Prefer the '*.sym' file over the '.exe', which should exist at the same
// location in debug builds
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment