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
05805ce0
Commit
05805ce0
authored
15 years ago
by
Robert Loehning
Browse files
Options
Downloads
Patches
Plain Diff
Trk: Fixed init of Laucher for debugging
parent
9f7794a3
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/qt-s60/s60devicerunconfiguration.cpp
+4
-2
4 additions, 2 deletions
...ns/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
with
4 additions
and
2 deletions
src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
+
4
−
2
View file @
05805ce0
...
@@ -624,7 +624,7 @@ void S60DeviceRunControlBase::signsisProcessFinished()
...
@@ -624,7 +624,7 @@ void S60DeviceRunControlBase::signsisProcessFinished()
emit
finished
();
emit
finished
();
return
;
return
;
}
}
m_launcher
=
new
trk
::
Launcher
(
trk
::
Launcher
::
ActionCopyInstallRun
);
m_launcher
=
new
trk
::
Launcher
();
connect
(
m_launcher
,
SIGNAL
(
finished
()),
this
,
SLOT
(
launcherFinished
()));
connect
(
m_launcher
,
SIGNAL
(
finished
()),
this
,
SLOT
(
launcherFinished
()));
connect
(
m_launcher
,
SIGNAL
(
copyingStarted
()),
this
,
SLOT
(
printCopyingNotice
()));
connect
(
m_launcher
,
SIGNAL
(
copyingStarted
()),
this
,
SLOT
(
printCopyingNotice
()));
connect
(
m_launcher
,
SIGNAL
(
canNotCreateFile
(
QString
,
QString
)),
this
,
SLOT
(
printCreateFileFailed
(
QString
,
QString
)));
connect
(
m_launcher
,
SIGNAL
(
canNotCreateFile
(
QString
,
QString
)),
this
,
SLOT
(
printCreateFileFailed
(
QString
,
QString
)));
...
@@ -723,6 +723,7 @@ void S60DeviceRunControl::initLauncher(const QString &executable, trk::Launcher
...
@@ -723,6 +723,7 @@ void S60DeviceRunControl::initLauncher(const QString &executable, trk::Launcher
connect
(
launcher
,
SIGNAL
(
applicationRunning
(
uint
)),
this
,
SLOT
(
printRunNotice
(
uint
)));
connect
(
launcher
,
SIGNAL
(
applicationRunning
(
uint
)),
this
,
SLOT
(
printRunNotice
(
uint
)));
connect
(
launcher
,
SIGNAL
(
canNotRun
(
QString
)),
this
,
SLOT
(
printRunFailNotice
(
QString
)));
connect
(
launcher
,
SIGNAL
(
canNotRun
(
QString
)),
this
,
SLOT
(
printRunFailNotice
(
QString
)));
connect
(
launcher
,
SIGNAL
(
applicationOutputReceived
(
QString
)),
this
,
SLOT
(
printApplicationOutput
(
QString
)));
connect
(
launcher
,
SIGNAL
(
applicationOutputReceived
(
QString
)),
this
,
SLOT
(
printApplicationOutput
(
QString
)));
launcher
->
addStartupActions
(
trk
::
Launcher
::
ActionCopyInstallRun
);
launcher
->
setFileName
(
executable
);
launcher
->
setFileName
(
executable
);
}
}
...
@@ -780,7 +781,7 @@ S60DeviceDebugRunControl::~S60DeviceDebugRunControl()
...
@@ -780,7 +781,7 @@ S60DeviceDebugRunControl::~S60DeviceDebugRunControl()
{
{
}
}
void
S60DeviceDebugRunControl
::
initLauncher
(
const
QString
&
executable
,
trk
::
Launcher
*
)
void
S60DeviceDebugRunControl
::
initLauncher
(
const
QString
&
executable
,
trk
::
Launcher
*
launcher
)
{
{
// No setting an executable on the launcher causes it to deploy only
// No setting an executable on the launcher causes it to deploy only
m_startParams
->
executable
=
executable
;
m_startParams
->
executable
=
executable
;
...
@@ -796,6 +797,7 @@ void S60DeviceDebugRunControl::initLauncher(const QString &executable, trk::Laun
...
@@ -796,6 +797,7 @@ void S60DeviceDebugRunControl::initLauncher(const QString &executable, trk::Laun
emit
addToOutputWindow
(
this
,
tr
(
"Warning: Cannot locate the symbol file belonging to %1."
).
arg
(
localExecutableFileName
));
emit
addToOutputWindow
(
this
,
tr
(
"Warning: Cannot locate the symbol file belonging to %1."
).
arg
(
localExecutableFileName
));
}
}
}
}
launcher
->
addStartupActions
(
trk
::
Launcher
::
ActionCopyInstall
);
}
}
void
S60DeviceDebugRunControl
::
handleLauncherFinished
()
void
S60DeviceDebugRunControl
::
handleLauncherFinished
()
...
...
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