feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Qnx: Move the dataDirPath() method to QnxUtils class

Browse Source 
Change-Id: I6bc02a83263da4ce01fe3238aefee20a68507595
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
This commit is contained in:
El Mehdi Fekari
2013-06-12 14:09:01 +02:00
committed by Mehdi Fekari
parent ab94f6ebc5
commit 6b2162f2a9
6 changed files with 35 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/qnx/blackberrydeviceconfigurationwizardpages.cpp
View File

@@ -36,6 +36,7 @@
#include "ui_blackberrydeviceconfigurationwizardsetuppage.h"
#include "ui_blackberrydeviceconfigurationwizardsshkeypage.h"
#include "blackberryconfiguration.h"
#include "qnxutils.h"
#include <coreplugin/icore.h>
#include <ssh/sshkeygenerator.h>
@@ -70,7 +71,7 @@ BlackBerryDeviceConfigurationWizardSetupPage::BlackBerryDeviceConfigurationWizar
m_ui->debugToken->setExpectedKind(Utils::PathChooser::File);
m_ui->debugToken->setPromptDialogFilter(QLatin1String("*.bar"));
QString debugTokenBrowsePath = BlackBerryConfiguration::instance().dataDirPath();
QString debugTokenBrowsePath = QnxUtils::dataDirPath();
if (!QFileInfo(debugTokenBrowsePath).exists())
debugTokenBrowsePath = QDir::homePath();
m_ui->debugToken->setInitialBrowsePathBackup(debugTokenBrowsePath);
@@ -168,7 +169,7 @@ BlackBerryDeviceConfigurationWizardSshKeyPage::BlackBerryDeviceConfigurationWiza
m_ui->privateKey->setExpectedKind(Utils::PathChooser::File);
m_ui->progressBar->hide();
QString initialBrowsePath = BlackBerryConfiguration::instance().dataDirPath();
QString initialBrowsePath = QnxUtils::dataDirPath();
if (!QFileInfo(initialBrowsePath).exists())
initialBrowsePath = QDir::homePath();
m_ui->privateKey->setInitialBrowsePathBackup(initialBrowsePath);
@@ -267,7 +268,7 @@ bool BlackBerryDeviceConfigurationWizardSshKeyPage::saveKeys(const QString &priv
void BlackBerryDeviceConfigurationWizardSshKeyPage::generateSshKeys()
{
QString lookInDir = BlackBerryConfiguration::instance().dataDirPath();
QString lookInDir = QnxUtils::dataDirPath();
if (!QFileInfo(lookInDir).exists())
lookInDir = QDir::homePath();