Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Tobias Hunger
qt-creator
Commits
1b3f8c57
Commit
1b3f8c57
authored
Feb 10, 2011
by
Christian Kandeler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Maemo: Add default value to device config wizard.
Task-number: QTCREATORBUG-3782
parent
de44d038
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
2 deletions
+8
-2
src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
.../qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
+5
-0
src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.h
...ns/qt4projectmanager/qt-maemo/maemodeviceconfigurations.h
+1
-0
src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigwizard.cpp
...ns/qt4projectmanager/qt-maemo/maemodeviceconfigwizard.cpp
+2
-2
No files found.
src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
View file @
1b3f8c57
...
...
@@ -326,6 +326,11 @@ QString MaemoDeviceConfig::defaultPrivateKeyFilePath()
+
QLatin1String
(
"/.ssh/id_rsa"
);
}
QString
MaemoDeviceConfig
::
defaultPublicKeyFilePath
()
{
return
defaultPrivateKeyFilePath
()
+
QLatin1String
(
".pub"
);
}
QString
MaemoDeviceConfig
::
defaultUser
(
MaemoGlobal
::
MaemoVersion
osVersion
)
{
switch
(
osVersion
)
{
...
...
src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.h
View file @
1b3f8c57
...
...
@@ -87,6 +87,7 @@ public:
static
QString
portsRegExpr
();
static
QString
defaultHost
(
DeviceType
type
);
static
QString
defaultPrivateKeyFilePath
();
static
QString
defaultPublicKeyFilePath
();
static
QString
defaultUser
(
MaemoGlobal
::
MaemoVersion
osVersion
);
static
int
defaultSshPort
(
DeviceType
type
);
static
QString
defaultQemuPassword
(
MaemoGlobal
::
MaemoVersion
osVersion
);
...
...
src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigwizard.cpp
View file @
1b3f8c57
...
...
@@ -225,8 +225,8 @@ public:
virtual
void
initializePage
()
{
m_ui
->
dontReuseButton
->
setChecked
(
true
);
m_ui
->
privateKeyFilePathChooser
->
setPath
(
QString
());
m_ui
->
publicKeyFilePathChooser
->
setPath
(
QString
());
m_ui
->
privateKeyFilePathChooser
->
setPath
(
MaemoDeviceConfig
::
defaultPrivateKeyFilePath
());
m_ui
->
publicKeyFilePathChooser
->
setPath
(
MaemoDeviceConfig
::
defaultPublicKeyFilePath
());
handleSelectionChanged
();
}
...
...
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