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
6782d848
Commit
6782d848
authored
Feb 22, 2010
by
Friedemann Kleint
Browse files
GnuPoc: Do create pre-parsed pkg-file.
parent
8d14f18e
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
View file @
6782d848
...
...
@@ -671,12 +671,6 @@ void S60DeviceRunControlBase::start()
return
;
}
if
(
!
createPackageFileFromTemplate
(
&
errorMessage
))
{
error
(
this
,
errorMessage
);
emit
finished
();
return
;
}
QStringList
makeSisArgs
;
switch
(
m_toolChain
)
{
case
ProjectExplorer
::
ToolChain
::
GCCE_GNUPOC
:
...
...
@@ -687,6 +681,12 @@ void S60DeviceRunControlBase::start()
<<
(
QLatin1String
(
"QT_SIS_KEY="
)
+
signSisKey
());
break
;
default:
// ABLD: Create from template, replacing paths
if
(
!
createPackageFileFromTemplate
(
&
errorMessage
))
{
error
(
this
,
errorMessage
);
emit
finished
();
return
;
}
makeSisArgs
.
push_back
(
m_packageFile
);
break
;
}
...
...
@@ -737,29 +737,29 @@ void S60DeviceRunControlBase::readStandardOutput()
emit
addToOutputWindowInline
(
this
,
QString
::
fromLocal8Bit
(
data
.
constData
(),
data
.
length
()));
}
// ABLD: Create "foo_<platform>_<target>.pkg" and replace variables for the target
// path pointing into the EPOC directories.
bool
S60DeviceRunControlBase
::
createPackageFileFromTemplate
(
QString
*
errorMessage
)
{
if
(
debug
)
qDebug
()
<<
"Creating package file"
<<
m_packageFilePath
<<
" from "
<<
m_packageTemplateFile
<<
m_symbianPlatform
<<
m_symbianTarget
;
QFile
packageTemplate
(
m_packageTemplateFile
);
if
(
!
packageTemplate
.
open
(
QIODevice
::
ReadOnly
))
{
if
(
!
packageTemplate
.
open
(
QIODevice
::
ReadOnly
|
QIODevice
::
Text
))
{
*
errorMessage
=
tr
(
"Could not read template package file '%1'"
).
arg
(
QDir
::
toNativeSeparators
(
m_packageTemplateFile
));
return
false
;
}
QString
contents
=
packageTemplate
.
readAll
();
QString
contents
=
QString
::
fromLocal8Bit
(
packageTemplate
.
readAll
()
)
;
packageTemplate
.
close
();
contents
.
replace
(
QLatin1String
(
"$(PLATFORM)"
),
m_symbianPlatform
);
contents
.
replace
(
QLatin1String
(
"$(TARGET)"
),
m_symbianTarget
);
QFile
packageFile
(
m_packageFilePath
);
if
(
!
packageFile
.
open
(
QIODevice
::
WriteOnly
))
{
if
(
!
packageFile
.
open
(
QIODevice
::
WriteOnly
|
QIODevice
::
Text
))
{
*
errorMessage
=
tr
(
"Could not write package file '%1'"
).
arg
(
QDir
::
toNativeSeparators
(
m_packageFilePath
));
return
false
;
}
packageFile
.
write
(
contents
.
toLocal8Bit
());
packageFile
.
close
();
if
(
debug
>
1
)
qDebug
()
<<
contents
;
return
true
;
}
...
...
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