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
d66d188f
Commit
d66d188f
authored
May 21, 2010
by
con
Browse files
Build fix.
Reviewed-by: kh
parent
886aef93
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.h
View file @
d66d188f
...
...
@@ -88,11 +88,6 @@ public:
MaemoDeviceConfig
deviceConfig
()
const
;
QString
runtimeGdbServerPort
()
const
;
<<<<<<<
HEAD
=======
const
QString
sshCmd
()
const
;
const
QString
scpCmd
()
const
;
>>>>>>>
origin
/
2.0
const
QString
gdbCmd
()
const
;
const
QString
dumperLib
()
const
;
...
...
@@ -113,10 +108,6 @@ private slots:
private:
void
init
();
<<<<<<<
HEAD
=======
const
QString
cmd
(
const
QString
&
cmdName
)
const
;
>>>>>>>
origin
/
2.0
const
MaemoToolChain
*
toolchain
()
const
;
bool
fileNeedsDeployment
(
const
QString
&
path
,
const
QDateTime
&
lastDeployed
)
const
;
void
addDeployTimesToMap
(
const
QString
&
key
,
...
...
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