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
Tobias Hunger
qt-creator
Commits
8e2c274d
Commit
8e2c274d
authored
Aug 05, 2010
by
Pawel Polanski
Browse files
Application is not launched if an error occurred during deployment for Symbian OS
Reviewed-by: Tobias Hunger
parent
ade58cdc
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp
View file @
8e2c274d
...
...
@@ -340,7 +340,7 @@ void S60CreatePackageStep::slotProcessFinished(int, QProcess::ExitStatus)
//waiting for the user to input new passphrase or to abort
m_waitCondition
.
wait
(
&
m_mutex
);
if
(
m_errorType
==
ErrorUndefined
)
{
m_eventLoop
->
exit
(
tru
e
);
m_eventLoop
->
exit
(
fals
e
);
return
;
}
else
{
QRegExp
passphraseRegExp
(
"^"
+
QLatin1String
(
MAKE_PASSPHRASE_ARGUMENT
)
+
"(.+)$"
);
...
...
src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
View file @
8e2c274d
...
...
@@ -231,13 +231,14 @@ void S60DeployStep::setupConnections()
connect
(
SymbianUtils
::
SymbianDeviceManager
::
instance
(),
SIGNAL
(
deviceRemoved
(
SymbianUtils
::
SymbianDevice
)),
this
,
SLOT
(
deviceRemoved
(
SymbianUtils
::
SymbianDevice
)));
connect
(
m_launcher
,
SIGNAL
(
finished
()),
this
,
SLOT
(
launcherFinished
()));
connect
(
m_launcher
,
SIGNAL
(
canNotConnect
(
QString
)),
this
,
SLOT
(
printConnectFailed
(
QString
)));
connect
(
m_launcher
,
SIGNAL
(
canNotConnect
(
QString
)),
this
,
SLOT
(
connectFailed
(
QString
)));
connect
(
m_launcher
,
SIGNAL
(
copyingStarted
()),
this
,
SLOT
(
printCopyingNotice
()));
connect
(
m_launcher
,
SIGNAL
(
canNotCreateFile
(
QString
,
QString
)),
this
,
SLOT
(
printC
reateFileFailed
(
QString
,
QString
)));
connect
(
m_launcher
,
SIGNAL
(
canNotWriteFile
(
QString
,
QString
)),
this
,
SLOT
(
printW
riteFileFailed
(
QString
,
QString
)));
connect
(
m_launcher
,
SIGNAL
(
canNotCloseFile
(
QString
,
QString
)),
this
,
SLOT
(
printC
loseFileFailed
(
QString
,
QString
)));
connect
(
m_launcher
,
SIGNAL
(
canNotCreateFile
(
QString
,
QString
)),
this
,
SLOT
(
c
reateFileFailed
(
QString
,
QString
)));
connect
(
m_launcher
,
SIGNAL
(
canNotWriteFile
(
QString
,
QString
)),
this
,
SLOT
(
w
riteFileFailed
(
QString
,
QString
)));
connect
(
m_launcher
,
SIGNAL
(
canNotCloseFile
(
QString
,
QString
)),
this
,
SLOT
(
c
loseFileFailed
(
QString
,
QString
)));
connect
(
m_launcher
,
SIGNAL
(
installingStarted
()),
this
,
SLOT
(
printInstallingNotice
()));
connect
(
m_launcher
,
SIGNAL
(
canNotInstall
(
QString
,
QString
)),
this
,
SLOT
(
printI
nstallFailed
(
QString
,
QString
)));
connect
(
m_launcher
,
SIGNAL
(
canNotInstall
(
QString
,
QString
)),
this
,
SLOT
(
i
nstallFailed
(
QString
,
QString
)));
connect
(
m_launcher
,
SIGNAL
(
installingFinished
()),
this
,
SLOT
(
printInstallingFinished
()));
connect
(
m_launcher
,
SIGNAL
(
stateChanged
(
int
)),
this
,
SLOT
(
slotLauncherStateChanged
(
int
)));
}
...
...
@@ -275,7 +276,7 @@ void S60DeployStep::startDeployment()
void
S60DeployStep
::
run
(
QFutureInterface
<
bool
>
&
fi
)
{
m_futureInterface
=
&
fi
;
m_deployResult
=
fals
e
;
m_deployResult
=
tru
e
;
connect
(
this
,
SIGNAL
(
finished
()),
this
,
SLOT
(
launcherFinished
()));
connect
(
this
,
SIGNAL
(
finishNow
()),
...
...
@@ -322,25 +323,29 @@ void S60DeployStep::slotWaitingForTrkClosed()
}
}
void
S60DeployStep
::
printC
reateFileFailed
(
const
QString
&
filename
,
const
QString
&
errorMessage
)
void
S60DeployStep
::
c
reateFileFailed
(
const
QString
&
filename
,
const
QString
&
errorMessage
)
{
appendMessage
(
tr
(
"Could not create file %1 on device: %2"
).
arg
(
filename
,
errorMessage
),
true
);
m_deployResult
=
false
;
}
void
S60DeployStep
::
printW
riteFileFailed
(
const
QString
&
filename
,
const
QString
&
errorMessage
)
void
S60DeployStep
::
w
riteFileFailed
(
const
QString
&
filename
,
const
QString
&
errorMessage
)
{
appendMessage
(
tr
(
"Could not write to file %1 on device: %2"
).
arg
(
filename
,
errorMessage
),
true
);
m_deployResult
=
false
;
}
void
S60DeployStep
::
printC
loseFileFailed
(
const
QString
&
filename
,
const
QString
&
errorMessage
)
void
S60DeployStep
::
c
loseFileFailed
(
const
QString
&
filename
,
const
QString
&
errorMessage
)
{
const
QString
msg
=
tr
(
"Could not close file %1 on device: %2. It will be closed when App TRK is closed."
);
appendMessage
(
msg
.
arg
(
filename
,
errorMessage
),
true
);
m_deployResult
=
false
;
}
void
S60DeployStep
::
printC
onnectFailed
(
const
QString
&
errorMessage
)
void
S60DeployStep
::
c
onnectFailed
(
const
QString
&
errorMessage
)
{
appendMessage
(
tr
(
"Could not connect to App TRK on device: %1. Restarting App TRK might help."
).
arg
(
errorMessage
),
true
);
m_deployResult
=
false
;
}
void
S60DeployStep
::
printCopyingNotice
()
...
...
@@ -358,9 +363,10 @@ void S60DeployStep::printInstallingFinished()
appendMessage
(
tr
(
"Installation has finished"
),
false
);
}
void
S60DeployStep
::
printI
nstallFailed
(
const
QString
&
filename
,
const
QString
&
errorMessage
)
void
S60DeployStep
::
i
nstallFailed
(
const
QString
&
filename
,
const
QString
&
errorMessage
)
{
appendMessage
(
tr
(
"Could not install from package %1 on device: %2"
).
arg
(
filename
,
errorMessage
),
true
);
m_deployResult
=
false
;
}
void
S60DeployStep
::
checkForCancel
()
...
...
@@ -379,12 +385,11 @@ void S60DeployStep::launcherFinished()
m_handleDeviceRemoval
=
false
;
trk
::
Launcher
::
releaseToDeviceManager
(
m_launcher
);
}
m_deployResult
=
true
;
if
(
m_launcher
)
m_launcher
->
deleteLater
();
m_launcher
=
0
;
if
(
m_eventLoop
)
m_eventLoop
->
exit
(
0
);
m_eventLoop
->
exit
();
}
void
S60DeployStep
::
deviceRemoved
(
const
SymbianUtils
::
SymbianDevice
&
d
)
...
...
src/plugins/qt4projectmanager/qt-s60/s60deploystep.h
View file @
8e2c274d
...
...
@@ -98,13 +98,13 @@ protected slots:
void
deviceRemoved
(
const
SymbianUtils
::
SymbianDevice
&
);
private
slots
:
void
printC
onnectFailed
(
const
QString
&
errorMessage
);
void
c
onnectFailed
(
const
QString
&
errorMessage
);
void
printCopyingNotice
();
void
printC
reateFileFailed
(
const
QString
&
filename
,
const
QString
&
errorMessage
);
void
printW
riteFileFailed
(
const
QString
&
filename
,
const
QString
&
errorMessage
);
void
printC
loseFileFailed
(
const
QString
&
filename
,
const
QString
&
errorMessage
);
void
c
reateFileFailed
(
const
QString
&
filename
,
const
QString
&
errorMessage
);
void
w
riteFileFailed
(
const
QString
&
filename
,
const
QString
&
errorMessage
);
void
c
loseFileFailed
(
const
QString
&
filename
,
const
QString
&
errorMessage
);
void
printInstallingNotice
();
void
printI
nstallFailed
(
const
QString
&
filename
,
const
QString
&
errorMessage
);
void
i
nstallFailed
(
const
QString
&
filename
,
const
QString
&
errorMessage
);
void
printInstallingFinished
();
void
launcherFinished
();
void
slotLauncherStateChanged
(
int
);
...
...
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