Commit bb854ec7 authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Orgad Shaneh

Qnx: Fix MSVC warnings

e.g.
warning: C4482: nonstandard extension used: enum
'Qnx::Internal::BlackBerryCreatePackageStep::EditMode' used in qualified
name

Change-Id: I32b78925ad9d5c8ee938b749d7d4c3525952bdd7
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
parent c8890258
......@@ -273,7 +273,7 @@ void BarDescriptorFileNodeManager::updateBarDescriptor(const QString &barDescrip
BlackBerryCreatePackageStep *createPackageStep = dynamic_cast<BlackBerryCreatePackageStep *>(step);
if (createPackageStep) {
createPackageStep->doUpdateAppDescriptorFile(barDescriptorPath,
BlackBerryCreatePackageStep::EditMode::QtEnvironment,
BlackBerryCreatePackageStep::QtEnvironment,
skipConfirmation);
}
}
......
......@@ -331,18 +331,18 @@ bool BlackBerryApiLevelConfiguration::activate()
}
// Create tool chains
QnxToolChain *armvle7ToolChain = createToolChain(QnxArchitecture::ArmLeV7,
QnxToolChain *armvle7ToolChain = createToolChain(ArmLeV7,
tr("QCC for %1").arg(armVersionName),
ndkPath());
QnxToolChain *x86ToolChain = createToolChain(QnxArchitecture::X86,
QnxToolChain *x86ToolChain = createToolChain(X86,
tr("QCC for %1").arg(x86VersionName),
ndkPath());
// Create debuggers
QVariant armDebuggerId = createDebuggerItem(QnxArchitecture::ArmLeV7,
tr("Debugger for %1").arg(armVersionName));
QVariant armDebuggerId = createDebuggerItem(ArmLeV7,
tr("Debugger for %1").arg(armVersionName));
QVariant x86DebuggerId = createDebuggerItem(QnxArchitecture::X86,
tr("Debugger for %1").arg(x86VersionName));
QVariant x86DebuggerId = createDebuggerItem(X86,
tr("Debugger for %1").arg(x86VersionName));
// create kits
if (qt4ArmVersion)
......
......@@ -262,7 +262,7 @@ bool BlackBerryCreatePackageStep::init()
}
const QString appDescriptorPath = info.appDescriptorPath();
if (!doUpdateAppDescriptorFile(appDescriptorPath, EditMode::PlaceHolders))
if (!doUpdateAppDescriptorFile(appDescriptorPath, PlaceHolders))
// If there is an error, prepareAppDescriptorFile() will raise it
return false;
......@@ -423,7 +423,7 @@ void BlackBerryCreatePackageStep::updateAppDescriptorFile()
return;
foreach (const BarPackageDeployInformation &info, packagesToDeploy)
doUpdateAppDescriptorFile(info.appDescriptorPath(), EditMode::QtEnvironment);
doUpdateAppDescriptorFile(info.appDescriptorPath(), QtEnvironment);
}
bool BlackBerryCreatePackageStep::doUpdateAppDescriptorFile(const QString &appDescriptorPath,
......@@ -443,7 +443,7 @@ bool BlackBerryCreatePackageStep::doUpdateAppDescriptorFile(const QString &appDe
BarDescriptorAssetList assetList = doc.value(BarDescriptorDocument::asset)
.value<BarDescriptorAssetList>();
bool updated = false;
if (types.testFlag(EditMode::PlaceHolders)) {
if (types.testFlag(PlaceHolders)) {
foreach (const BarDescriptorAsset &a, assetList) {
if (a.source.contains(QLatin1String("%SRC_DIR%"))) {
......@@ -469,7 +469,7 @@ bool BlackBerryCreatePackageStep::doUpdateAppDescriptorFile(const QString &appDe
}
}
if (types.testFlag(EditMode::QtEnvironment)) {
if (types.testFlag(QtEnvironment)) {
bool environmentUpdated = false;
bool assetsUpdated = false;
// Set up correct environment depending on using bundled/pre-installed Qt
......
......@@ -99,7 +99,7 @@ void QnxSettingsWidget::addConfiguration()
return;
}
setConfigState(config, State::Added);
setConfigState(config, Added);
m_ui->configsCombo->addItem(config->displayName(),
QVariant::fromValue(static_cast<void*>(config)));
}
......@@ -120,7 +120,7 @@ void QnxSettingsWidget::removeConfiguration()
QMessageBox::Yes | QMessageBox::No);
if (button == QMessageBox::Yes) {
setConfigState(config, State::Removed);
setConfigState(config, Removed);
m_ui->configsCombo->removeItem(currentIndex);
}
}
......@@ -133,7 +133,7 @@ void QnxSettingsWidget::generateKits(bool checked)
if (!config)
return;
setConfigState(config, checked ? State::Activated : State::Deactivated);
setConfigState(config, checked ? Activated : Deactivated);
}
void QnxSettingsWidget::updateInformation()
......@@ -198,16 +198,16 @@ void QnxSettingsWidget::applyChanges()
{
foreach (const ConfigState &configState, m_changedConfigs) {
switch (configState.state) {
case State::Activated :
case Activated :
configState.config->activate();
break;
case State::Deactivated:
case Deactivated:
configState.config->deactivate();
break;
case State::Added:
case Added:
m_qnxConfigManager->addConfiguration(configState.config);
break;
case State::Removed:
case Removed:
configState.config->deactivate();
m_qnxConfigManager->removeConfiguration(configState.config);
break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment