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
37fa34e2
Commit
37fa34e2
authored
Apr 12, 2011
by
Christian Kandeler
Browse files
Maemo: Fix deployment issues with disabled packaging.
parent
a0d1d7af
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
View file @
37fa34e2
...
...
@@ -352,8 +352,10 @@ void MaemoDeployStep::start()
const
int
deployableCount
=
m_deployables
->
deployableCount
();
for
(
int
i
=
0
;
i
<
deployableCount
;
++
i
)
{
const
MaemoDeployable
&
d
=
m_deployables
->
deployableAt
(
i
);
if
(
currentlyNeedsDeployment
(
hostName
,
d
))
if
(
currentlyNeedsDeployment
(
hostName
,
d
)
||
QFileInfo
(
d
.
localFilePath
).
isDir
())
{
m_filesToCopy
<<
d
;
}
}
}
...
...
@@ -650,6 +652,8 @@ void MaemoDeployStep::installToSysroot()
+
d
.
remoteDir
+
sep
+
QFileInfo
(
d
.
localFilePath
).
fileName
();
sysRootDir
.
mkpath
(
d
.
remoteDir
.
mid
(
1
));
QFile
::
remove
(
targetFilePath
);
QString
dummy
;
MaemoGlobal
::
removeRecursively
(
targetFilePath
,
dummy
);
if
(
!
MaemoGlobal
::
copyRecursively
(
d
.
localFilePath
,
targetFilePath
))
{
writeOutput
(
tr
(
"Sysroot installation failed: "
"Could not copy '%1' to '%2'. Continuing anyway."
)
...
...
src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
View file @
37fa34e2
...
...
@@ -30,7 +30,6 @@
** Nokia at qt-info@nokia.com.
**
**************************************************************************/
#include "maemoglobal.h"
#include "maemoconstants.h"
...
...
Write
Preview
Markdown
is supported
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