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
7edc45a2
Commit
7edc45a2
authored
Nov 02, 2010
by
Christian Kandeler
Browse files
Maemo: Re-enable package installation via UTFS mount.
parent
f2d14996
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
View file @
7edc45a2
...
...
@@ -422,11 +422,9 @@ void MaemoDeployStep::handleUnmounted()
switch
(
m_unmountState
)
{
case
OldDirsUnmount
:
#if 0 // TODO: Disabled for 2.1. Re-enable later or throw away for good.
if
(
toolChain
()
->
allowsRemoteMounts
())
setupMount
();
else
#endif
prepareSftpConnection
();
break
;
case
CurrentDirsUnmount
:
...
...
src/plugins/qt4projectmanager/qt-maemo/maemorunfactories.cpp
View file @
7edc45a2
...
...
@@ -168,10 +168,8 @@ bool MaemoRunControlFactory::canRun(RunConfiguration *runConfiguration,
return
false
;
const
int
freePortCount
=
maemoRunConfig
->
freePorts
().
count
();
#if 0 // TODO: Enable if deployment-via-mount is enabled again, otherwise throw away.
if
(
maemoRunConfig
->
toolchain
()
->
allowsRemoteMounts
()
&&
freePortCount
==
0
)
return
false
;
#endif
const
int
mountDirCount
=
maemoRunConfig
->
toolchain
()
->
allowsRemoteMounts
()
?
maemoRunConfig
->
remoteMounts
()
->
validMountSpecificationCount
()
...
...
src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.h
View file @
7edc45a2
...
...
@@ -55,10 +55,7 @@ public:
enum
MaemoVersion
{
Maemo5
,
Maemo6
};
MaemoVersion
version
()
const
;
bool
allowsRemoteMounts
()
const
{
return
version
()
==
Maemo5
;
}
// TODO: Perhaps re-enable when we deploy via UTFS again, otherwise throw the whole function away.
bool
allowsPackagingDisabling
()
const
{
return
/* version() == Maemo5 */
false
;
}
bool
allowsPackagingDisabling
()
const
{
return
version
()
==
Maemo5
;
}
bool
allowsQmlDebugging
()
const
{
return
version
()
==
Maemo6
;
}
protected:
...
...
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