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
1a365180
Commit
1a365180
authored
Feb 02, 2011
by
Pawel Polanski
Browse files
Symbian: Add timeout to CODA's serial ping message
parent
f1c46420
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp
View file @
1a365180
...
...
@@ -117,7 +117,7 @@ bool CodaRunControl::setupLauncher()
m_tcfTrkDevice
=
new
TcfTrkDevice
;
if
(
debug
)
m_tcfTrkDevice
->
setVerbose
(
1
);
m_tcfTrkDevice
->
setVerbose
(
debug
);
connect
(
m_tcfTrkDevice
,
SIGNAL
(
error
(
QString
)),
this
,
SLOT
(
slotError
(
QString
)));
connect
(
m_tcfTrkDevice
,
SIGNAL
(
logMessage
(
QString
)),
this
,
SLOT
(
slotTrkLogMessage
(
QString
)));
...
...
@@ -136,6 +136,7 @@ bool CodaRunControl::setupLauncher()
}
m_state
=
StateConnecting
;
m_tcfTrkDevice
->
sendSerialPing
(
false
);
QTimer
::
singleShot
(
4000
,
this
,
SLOT
(
checkForTimeout
()));
}
else
{
const
QSharedPointer
<
QTcpSocket
>
tcfTrkSocket
(
new
QTcpSocket
);
m_tcfTrkDevice
->
setDevice
(
tcfTrkSocket
);
...
...
src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
View file @
1a365180
...
...
@@ -391,6 +391,7 @@ void S60DeployStep::startDeployment()
}
m_state
=
StateConnecting
;
m_trkDevice
->
sendSerialPing
(
false
);
QTimer
::
singleShot
(
4000
,
this
,
SLOT
(
checkForTimeout
()));
}
else
{
const
QSharedPointer
<
QTcpSocket
>
tcfTrkSocket
(
new
QTcpSocket
);
m_trkDevice
->
setDevice
(
tcfTrkSocket
);
...
...
@@ -462,7 +463,7 @@ void S60DeployStep::slotTcftrkEvent (const tcftrk::TcfTrkEvent &event)
switch
(
event
.
type
())
{
case
tcftrk
::
TcfTrkEvent
::
LocatorHello
:
{
// Commands accepted now
m_state
=
StateConnected
;
emit
tcp
Connected
();
emit
coda
Connected
();
startTransferring
();
break
;
}
...
...
@@ -620,13 +621,13 @@ void S60DeployStep::checkForTimeout()
return
;
const
QString
title
=
tr
(
"Waiting for CODA"
);
const
QString
text
=
tr
(
"Qt Creator is waiting for the CODA application to connect.
"
"Please make sure the application is running on "
"your mobile phone and the right IP address
and
port
are
"
const
QString
text
=
tr
(
"Qt Creator is waiting for the CODA application to connect."
"
\n
Please make sure the application is running on "
"your mobile phone and the right IP address
or serial
port
is
"
"configured in the project settings."
);
QMessageBox
*
mb
=
new
QMessageBox
(
QMessageBox
::
Information
,
title
,
text
,
QMessageBox
::
Cancel
,
Core
::
ICore
::
instance
()
->
mainWindow
());
connect
(
this
,
SIGNAL
(
tcp
Connected
()),
mb
,
SLOT
(
close
()));
connect
(
this
,
SIGNAL
(
coda
Connected
()),
mb
,
SLOT
(
close
()));
connect
(
this
,
SIGNAL
(
finished
()),
mb
,
SLOT
(
close
()));
connect
(
this
,
SIGNAL
(
finishNow
()),
mb
,
SLOT
(
close
()));
connect
(
mb
,
SIGNAL
(
finished
(
int
)),
this
,
SLOT
(
slotWaitingForTckTrkClosed
(
int
)));
...
...
src/plugins/qt4projectmanager/qt-s60/s60deploystep.h
View file @
1a365180
...
...
@@ -145,7 +145,7 @@ signals:
void
allFilesSent
();
void
allFilesInstalled
();
void
tcp
Connected
();
void
coda
Connected
();
void
manualInstallation
();
...
...
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