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
78724a83
Commit
78724a83
authored
Sep 14, 2009
by
Daniel Molkentin
Browse files
Build again with S60 defined on Windows.
parent
cb5ebe1c
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/plugins/debugger/gdb/trkgdbadapter.cpp
View file @
78724a83
...
...
@@ -86,7 +86,6 @@ TrkGdbAdapter::TrkGdbAdapter()
uid_t
userId
=
getuid
();
#endif
m_gdbServerName
=
QString
(
"127.0.0.1:%1"
).
arg
(
2222
+
userId
);
connect
(
&
m_gdbProc
,
SIGNAL
(
readyReadStandardError
()),
this
,
SIGNAL
(
readyReadStandardError
()));
connect
(
&
m_gdbProc
,
SIGNAL
(
readyReadStandardOutput
()),
...
...
src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
View file @
78724a83
...
...
@@ -541,21 +541,24 @@ S60DeviceRunControl::S60DeviceRunControl(QSharedPointer<RunConfiguration> runCon
Qt4Project
*
project
=
qobject_cast
<
Qt4Project
*>
(
runConfiguration
->
project
());
QTC_ASSERT
(
project
,
return
);
m_serialPortName
=
runConfiguration
->
serialPortName
();
S60DeviceRunConfiguration
*
s60runConfig
=
runConfiguration
.
objectCast
<
S60DeviceRunConfiguration
>
();
QTC_ASSERT
(
s60runConfig
,
return
);
m_serialPortName
=
s60runConfig
->
serialPortName
();
m_serialPortFriendlyName
=
S60Manager
::
instance
()
->
serialDeviceLister
()
->
friendlyNameForPort
(
m_serialPortName
);
m_targetName
=
runConfig
uration
->
targetName
();
m_baseFileName
=
runConfig
uration
->
basePackageFilePath
();
m_targetName
=
s60
runConfig
->
targetName
();
m_baseFileName
=
s60
runConfig
->
basePackageFilePath
();
m_workingDirectory
=
QFileInfo
(
m_baseFileName
).
absolutePath
();
m_qtDir
=
project
->
qtVersion
(
project
->
activeBuildConfiguration
())
->
versionInfo
().
value
(
"QT_INSTALL_DATA"
);
m_useCustomSignature
=
(
runConfig
uration
->
signingMode
()
==
S60DeviceRunConfiguration
::
SignCustom
);
m_customSignaturePath
=
runConfig
uration
->
customSignaturePath
();
m_customKeyPath
=
runConfig
uration
->
customKeyPath
();
m_useCustomSignature
=
(
s60
runConfig
->
signingMode
()
==
S60DeviceRunConfiguration
::
SignCustom
);
m_customSignaturePath
=
s60
runConfig
->
customSignaturePath
();
m_customKeyPath
=
s60
runConfig
->
customKeyPath
();
m_toolsDirectory
=
S60Manager
::
instance
()
->
deviceForQtVersion
(
project
->
qtVersion
(
project
->
activeBuildConfiguration
())).
toolsRoot
+
"/epoc32/tools"
;
m_executableFileName
=
lsFile
(
runConfig
uration
->
executableFileName
());
const
QString
makesisTool
=
m_toolsDirectory
+
"/makesis.exe"
;
const
QString
packageFile
=
QFileInfo
(
runConfig
uration
->
packageFileName
()).
fileName
();
m_executableFileName
=
lsFile
(
s60
runConfig
->
executableFileName
());
m_
makesisTool
=
m_toolsDirectory
+
"/makesis.exe"
;
m_
packageFile
=
QFileInfo
(
s60
runConfig
->
packageFileName
()).
fileName
();
}
void
S60DeviceRunControl
::
start
()
...
...
@@ -567,8 +570,8 @@ void S60DeviceRunControl::start()
m_makesis
->
setWorkingDirectory
(
m_workingDirectory
);
emit
addToOutputWindow
(
this
,
tr
(
"%1 %2"
).
arg
(
QDir
::
toNativeSeparators
(
makesisTool
),
packageFile
));
m_makesis
->
start
(
makesisTool
,
QStringList
(
packageFile
),
QIODevice
::
ReadOnly
);
emit
addToOutputWindow
(
this
,
tr
(
"%1 %2"
).
arg
(
QDir
::
toNativeSeparators
(
m_
makesisTool
),
m_
packageFile
));
m_makesis
->
start
(
m_
makesisTool
,
QStringList
(
m_
packageFile
),
QIODevice
::
ReadOnly
);
}
void
S60DeviceRunControl
::
stop
()
...
...
src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h
View file @
78724a83
...
...
@@ -183,6 +183,9 @@ private:
QString
m_customKeyPath
;
QProcess
*
m_makesis
;
QProcess
*
m_signsis
;
QString
m_makesisTool
;
QString
m_packageFile
;
trk
::
Launcher
*
m_launcher
;
};
...
...
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