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
322ef6b8
Commit
322ef6b8
authored
Jan 07, 2010
by
ck
Browse files
Maemo: Missing initialization bugfix + string capitalization.
parent
41e093cd
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/plugins/qt4projectmanager/qt-maemo/maemosettingspage.cpp
View file @
322ef6b8
...
@@ -165,8 +165,8 @@ private:
...
@@ -165,8 +165,8 @@ private:
PortAndTimeoutValidator
m_timeoutValidator
;
PortAndTimeoutValidator
m_timeoutValidator
;
NameValidator
m_nameValidator
;
NameValidator
m_nameValidator
;
#ifdef USE_SSH_LIB
#ifdef USE_SSH_LIB
MaemoSshDeployer
*
m_keyDeployer
;
MaemoSshRunner
*
m_deviceTester
;
MaemoSshRunner
*
m_deviceTester
;
MaemoSshDeployer
*
m_keyDeployer
;
#endif
#endif
QString
m_deviceTestOutput
;
QString
m_deviceTestOutput
;
QString
m_defaultTestOutput
;
QString
m_defaultTestOutput
;
...
@@ -224,6 +224,7 @@ MaemoSettingsWidget::MaemoSettingsWidget(QWidget *parent)
...
@@ -224,6 +224,7 @@ MaemoSettingsWidget::MaemoSettingsWidget(QWidget *parent)
m_nameValidator
(
m_devConfs
)
m_nameValidator
(
m_devConfs
)
#ifdef USE_SSH_LIB
#ifdef USE_SSH_LIB
,
m_deviceTester
(
0
)
,
m_deviceTester
(
0
)
,
m_keyDeployer
(
0
)
#endif
#endif
{
{
...
@@ -561,7 +562,7 @@ void MaemoSettingsWidget::stopDeploying()
...
@@ -561,7 +562,7 @@ void MaemoSettingsWidget::stopDeploying()
m_keyDeployer
->
stop
();
m_keyDeployer
->
stop
();
delete
m_keyDeployer
;
delete
m_keyDeployer
;
m_keyDeployer
=
0
;
m_keyDeployer
=
0
;
m_ui
->
deployKeyButton
->
setText
(
tr
(
"Deploy
k
ey ..."
));
m_ui
->
deployKeyButton
->
setText
(
tr
(
"Deploy
K
ey ..."
));
connect
(
m_ui
->
deployKeyButton
,
SIGNAL
(
clicked
()),
connect
(
m_ui
->
deployKeyButton
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
deployKey
()));
this
,
SLOT
(
deployKey
()));
m_ui
->
deployKeyButton
->
setEnabled
(
buttonWasEnabled
);
m_ui
->
deployKeyButton
->
setEnabled
(
buttonWasEnabled
);
...
...
src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.ui
View file @
322ef6b8
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
<rect>
<rect>
<x>
0
</x>
<x>
0
</x>
<y>
0
</y>
<y>
0
</y>
<width>
5
15
</width>
<width>
5
26
</width>
<height>
487
</height>
<height>
487
</height>
</rect>
</rect>
</property>
</property>
...
@@ -230,7 +230,7 @@ p, li { white-space: pre-wrap; }
...
@@ -230,7 +230,7 @@ p, li { white-space: pre-wrap; }
<bool>
false
</bool>
<bool>
false
</bool>
</property>
</property>
<property
name=
"text"
>
<property
name=
"text"
>
<string>
Deploy
k
ey ...
</string>
<string>
Deploy
K
ey ...
</string>
</property>
</property>
</widget>
</widget>
</item>
</item>
...
...
Write
Preview
Supports
Markdown
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