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
Tobias Hunger
qt-creator
Commits
a723e533
Commit
a723e533
authored
Mar 23, 2010
by
con
Browse files
Prefer command line arguments over environment for specifying certificates
for sis creation.
parent
de28b61c
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp
View file @
a723e533
...
...
@@ -101,12 +101,14 @@ bool S60CreatePackageStep::init()
return
false
;
Qt4BuildConfiguration
*
bc
=
qt4BuildConfiguration
();
ProjectExplorer
::
Environment
environment
=
bc
->
environment
();
setEnvironment
(
environment
);
QStringList
args
;
args
<<
QLatin1String
(
"sis"
);
if
(
signingMode
()
==
SignCustom
)
{
environment
.
set
(
QLatin1String
(
"QT_SIS_CERTIFICATE"
)
,
QDir
::
toNativeSeparators
(
customSignaturePath
())
);
environment
.
set
(
QLatin1String
(
"QT_SIS_KEY"
)
,
QDir
::
toNativeSeparators
(
customKeyPath
())
)
;
args
<<
QLatin1String
(
"QT_SIS_CERTIFICATE
=
"
)
+
QDir
::
toNativeSeparators
(
customSignaturePath
())
<<
QLatin1String
(
"QT_SIS_KEY
=
"
)
+
QDir
::
toNativeSeparators
(
customKeyPath
());
}
setEnvironment
(
environment
);
setArguments
(
QStringList
()
<<
"sis"
);
// overwrite any stuff done in make step
setArguments
(
args
);
// overwrite any stuff done in make step
return
true
;
}
...
...
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