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

Qnx: Handle bbnk-env file extension when adding manual target

Browse Source 
Task-number: QTCREATORBUG-10745

Change-Id: Ibefc228699ee339adccef5126cc167575be3ba5e
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
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-11-18 17:15:05 +01:00
committed by Mehdi Fekari
parent 939b0cae13
commit 105e5aec66
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/qnx/blackberryinstallwizardpages.cpp
View File

@@ -64,10 +64,13 @@ NdkPathChooser::NdkPathChooser(Mode mode, QWidget *parent)
: Utils::PathChooser(parent)
, m_mode(mode)
{
if (m_mode == NdkPathChooser::InstallMode)
if (m_mode == NdkPathChooser::InstallMode) {
setExpectedKind(Utils::PathChooser::Directory);
else
} else {
setExpectedKind(Utils::PathChooser::File);
setPromptDialogFilter(Utils::HostOsInfo::isWindowsHost() ? QLatin1String("*.bat") :
QLatin1String("*.sh"));
}
}
bool NdkPathChooser::validatePath(const QString &path, QString *errorMessage)
@@ -80,7 +83,10 @@ bool NdkPathChooser::validatePath(const QString &path, QString *errorMessage)
return !(QnxUtils::sdkInstallerPath(path).isEmpty());
QFileInfo fi(path);
return (fi.suffix() == QLatin1String("sh") || fi.suffix() == QLatin1String("bat"));
if (Utils::HostOsInfo::isWindowsHost())
return fi.suffix() == QLatin1String("bat");
return fi.suffix() == QLatin1String("sh");
}
//------------------------------------------------------------------