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
334837d7
Commit
334837d7
authored
Sep 09, 2009
by
con
Browse files
Move initialization code out of ::start method
parent
472c8069
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
View file @
334837d7
...
...
@@ -537,36 +537,34 @@ S60DeviceRunControl::S60DeviceRunControl(QSharedPointer<RunConfiguration> runCon
this
,
SLOT
(
signsisProcessFailed
()));
connect
(
m_signsis
,
SIGNAL
(
finished
(
int
,
QProcess
::
ExitStatus
)),
this
,
SLOT
(
signsisProcessFinished
()));
}
void
S60DeviceRunControl
::
start
()
{
QSharedPointer
<
S60DeviceRunConfiguration
>
rc
=
runConfiguration
().
objectCast
<
S60DeviceRunConfiguration
>
();
QTC_ASSERT
(
!
rc
.
isNull
(),
return
);
Qt4Project
*
project
=
qobject_cast
<
Qt4Project
*>
(
r
c
->
project
());
Qt4Project
*
project
=
qobject_cast
<
Qt4Project
*>
(
r
unConfiguration
->
project
());
QTC_ASSERT
(
project
,
return
);
m_serialPortName
=
r
c
->
serialPortName
();
m_serialPortName
=
r
unConfiguration
->
serialPortName
();
m_serialPortFriendlyName
=
S60Manager
::
instance
()
->
serialDeviceLister
()
->
friendlyNameForPort
(
m_serialPortName
);
m_targetName
=
r
c
->
targetName
();
m_baseFileName
=
r
c
->
basePackageFilePath
();
m_targetName
=
r
unConfiguration
->
targetName
();
m_baseFileName
=
r
unConfiguration
->
basePackageFilePath
();
m_workingDirectory
=
QFileInfo
(
m_baseFileName
).
absolutePath
();
m_qtDir
=
project
->
qtVersion
(
project
->
activeBuildConfiguration
())
->
versionInfo
().
value
(
"QT_INSTALL_DATA"
);
m_useCustomSignature
=
(
rc
->
signingMode
()
==
S60DeviceRunConfiguration
::
SignCustom
);
m_customSignaturePath
=
rc
->
customSignaturePath
();
m_customKeyPath
=
rc
->
customKeyPath
();
m_useCustomSignature
=
(
runConfiguration
->
signingMode
()
==
S60DeviceRunConfiguration
::
SignCustom
);
m_customSignaturePath
=
runConfiguration
->
customSignaturePath
();
m_customKeyPath
=
runConfiguration
->
customKeyPath
();
m_toolsDirectory
=
S60Manager
::
instance
()
->
deviceForQtVersion
(
project
->
qtVersion
(
project
->
activeBuildConfiguration
())).
toolsRoot
+
"/epoc32/tools"
;
m_executableFileName
=
lsFile
(
runConfiguration
->
executableFileName
());
const
QString
makesisTool
=
m_toolsDirectory
+
"/makesis.exe"
;
const
QString
packageFile
=
QFileInfo
(
runConfiguration
->
packageFileName
()).
fileName
();
}
void
S60DeviceRunControl
::
start
()
{
emit
started
();
emit
addToOutputWindow
(
this
,
tr
(
"Creating %1.sisx ..."
).
arg
(
QDir
::
toNativeSeparators
(
m_baseFileName
)));
emit
addToOutputWindow
(
this
,
tr
(
"Executable file: %1"
).
arg
(
lsFile
(
rc
->
executableFileName
())
));
emit
addToOutputWindow
(
this
,
tr
(
"Executable file: %1"
).
arg
(
m_
executableFileName
));
m_toolsDirectory
=
S60Manager
::
instance
()
->
deviceForQtVersion
(
project
->
qtVersion
(
project
->
activeBuildConfiguration
())).
toolsRoot
+
"/epoc32/tools"
;
const
QString
makesisTool
=
m_toolsDirectory
+
"/makesis.exe"
;
const
QString
packageFile
=
QFileInfo
(
rc
->
packageFileName
()).
fileName
();
m_makesis
->
setWorkingDirectory
(
m_workingDirectory
);
emit
addToOutputWindow
(
this
,
tr
(
"%1 %2"
).
arg
(
QDir
::
toNativeSeparators
(
makesisTool
),
packageFile
));
...
...
src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h
View file @
334837d7
...
...
@@ -176,6 +176,7 @@ private:
QString
m_baseFileName
;
QString
m_workingDirectory
;
QString
m_toolsDirectory
;
QString
m_executableFileName
;
QString
m_qtDir
;
bool
m_useCustomSignature
;
QString
m_customSignaturePath
;
...
...
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