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
79529551
Commit
79529551
authored
Jan 19, 2011
by
Friedemann Kleint
Browse files
CODA: Fix some messages.
parent
c736cc3c
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/plugins/debugger/gdb/tcftrkgdbadapter.cpp
View file @
79529551
...
...
@@ -1277,7 +1277,6 @@ void TcfTrkGdbAdapter::handleRegisterChildren(const tcftrk::TcfTrkCommandResult
logMessage
(
msg
);
m_trkDevice
->
setRegisterNames
(
registerNames
);
if
(
m_registerRequestPending
)
{
// Request already pending?
qDebug
(
"RR"
)
;
logMessage
(
_
(
"Resuming registers request after receiving register names..."
));
sendRegistersGetMCommand
();
}
...
...
src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
View file @
79529551
...
...
@@ -597,7 +597,7 @@ void S60DeployStep::checkForTimeout()
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 "
"your mobile phone and the right
IP
address and port are "
"configured in the project settings."
);
QMessageBox
*
mb
=
new
QMessageBox
(
QMessageBox
::
Information
,
title
,
text
,
QMessageBox
::
Cancel
,
Core
::
ICore
::
instance
()
->
mainWindow
());
...
...
src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
View file @
79529551
...
...
@@ -585,7 +585,7 @@ void S60DeviceRunControl::start()
emit
started
();
if
(
m_runSmartInstaller
)
{
//Smart Installer does the running by itself
appendMessage
(
tr
(
"Please finali
s
e the installation on your device."
),
NormalMessageFormat
);
appendMessage
(
tr
(
"Please finali
z
e the installation on your device."
),
NormalMessageFormat
);
emit
finished
();
return
;
}
...
...
@@ -766,7 +766,7 @@ void S60DeviceRunControl::slotTcftrkEvent(const TcfTrkEvent &event)
switch
(
event
.
type
())
{
case
TcfTrkEvent
::
LocatorHello
:
{
// Commands accepted now
m_state
=
StateConnected
;
appendMessage
(
tr
(
"Connected
!
"
),
NormalMessageFormat
);
appendMessage
(
tr
(
"Connected
.
"
),
NormalMessageFormat
);
if
(
m_launchProgress
)
m_launchProgress
->
setProgressValue
(
PROGRESS_MAX
*
0.80
);
initCommunication
();
...
...
@@ -885,7 +885,7 @@ void S60DeviceRunControl::handleCreateProcess(const TcfTrkCommandResult &result)
if
(
ok
)
{
if
(
m_launchProgress
)
m_launchProgress
->
setProgressValue
(
PROGRESS_MAX
);
appendMessage
(
tr
(
"Launched
!
"
),
NormalMessageFormat
);
appendMessage
(
tr
(
"Launched
.
"
),
NormalMessageFormat
);
}
else
{
appendMessage
(
tr
(
"Launch failed: %1"
).
arg
(
result
.
toString
()),
ErrorMessageFormat
);
finishRunControl
();
...
...
src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h
View file @
79529551
...
...
@@ -42,8 +42,6 @@
#include
<QtCore/QScopedPointer>
#include
<QtCore/QStringList>
#include
<QTime>
//TODO: remove
QT_BEGIN_NAMESPACE
class
QMessageBox
;
class
QWidget
;
...
...
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