Skip to content
GitLab
Menu
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
70e801bb
Commit
70e801bb
authored
Jul 08, 2010
by
ck
Browse files
Maemo: Handle missing specification for remote executable.
Reviewed-by: kh1
parent
05c55402
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/plugins/qt4projectmanager/qt-maemo/maemodeployables.cpp
View file @
70e801bb
...
@@ -139,7 +139,7 @@ QString MaemoDeployables::remoteExecutableFilePath(const QString &localExecutabl
...
@@ -139,7 +139,7 @@ QString MaemoDeployables::remoteExecutableFilePath(const QString &localExecutabl
if
(
model
->
localExecutableFilePath
()
==
localExecutableFilePath
)
if
(
model
->
localExecutableFilePath
()
==
localExecutableFilePath
)
return
model
->
remoteExecutableFilePath
();
return
model
->
remoteExecutableFilePath
();
}
}
Q_ASSERT
(
!
"Invalid local
executable!"
);
qWarning
(
"No remote
executable
specified
!"
);
return
QString
();
return
QString
();
}
}
...
...
src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp
View file @
70e801bb
...
@@ -202,7 +202,7 @@ void AbstractMaemoRunControl::deploy()
...
@@ -202,7 +202,7 @@ void AbstractMaemoRunControl::deploy()
m_sshDeployer
->
start
();
m_sshDeployer
->
start
();
}
else
{
}
else
{
m_progress
.
reportFinished
();
m_progress
.
reportFinished
();
startExecution
();
startExecution
IfPossible
();
}
}
}
}
...
@@ -248,6 +248,16 @@ bool AbstractMaemoRunControl::isCleaning() const
...
@@ -248,6 +248,16 @@ bool AbstractMaemoRunControl::isCleaning() const
return
m_initialCleaner
&&
m_initialCleaner
->
isRunning
();
return
m_initialCleaner
&&
m_initialCleaner
->
isRunning
();
}
}
void
AbstractMaemoRunControl
::
startExecutionIfPossible
()
{
if
(
executableFilePathOnTarget
().
isEmpty
())
{
handleError
(
tr
(
"Cannot run: No remote executable set."
));
emit
finished
();
}
else
{
startExecution
();
}
}
void
AbstractMaemoRunControl
::
startExecution
()
void
AbstractMaemoRunControl
::
startExecution
()
{
{
m_sshRunner
.
reset
(
new
MaemoSshRunner
(
m_devConfig
.
server
,
remoteCall
()));
m_sshRunner
.
reset
(
new
MaemoSshRunner
(
m_devConfig
.
server
,
remoteCall
()));
...
@@ -315,7 +325,7 @@ void AbstractMaemoRunControl::handleDeployThreadFinished()
...
@@ -315,7 +325,7 @@ void AbstractMaemoRunControl::handleDeployThreadFinished()
emit
finished
();
emit
finished
();
}
else
{
}
else
{
m_progress
.
reportFinished
();
m_progress
.
reportFinished
();
startExecution
();
startExecution
IfPossible
();
}
}
}
}
...
...
src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.h
View file @
70e801bb
...
@@ -109,6 +109,7 @@ private:
...
@@ -109,6 +109,7 @@ private:
void
startInitialCleanup
();
void
startInitialCleanup
();
void
killRemoteProcesses
(
const
QStringList
&
apps
,
bool
initialCleanup
);
void
killRemoteProcesses
(
const
QStringList
&
apps
,
bool
initialCleanup
);
void
startExecutionIfPossible
();
bool
isCleaning
()
const
;
bool
isCleaning
()
const
;
bool
isDeploying
()
const
;
bool
isDeploying
()
const
;
QString
remoteSudo
()
const
;
QString
remoteSudo
()
const
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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