From 975a8f2d53ef583f38d080feaa61c673ca6071ea Mon Sep 17 00:00:00 2001 From: kervala Date: Tue, 11 Oct 2016 18:43:07 +0200 Subject: [PATCH] Merge with develop --- .../client/ryzom_installer/src/installdialog.cpp | 12 ++++++------ .../client/ryzom_installer/src/migratedialog.cpp | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/code/ryzom/tools/client/ryzom_installer/src/installdialog.cpp b/code/ryzom/tools/client/ryzom_installer/src/installdialog.cpp index 6ec2a49ed..411602b0b 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/installdialog.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/installdialog.cpp @@ -36,6 +36,11 @@ CInstallDialog::CInstallDialog():QDialog() onDestinationDefaultButtonClicked(); #ifdef Q_OS_MAC + // only 64 bits for OS X + clientArchGroupBox->setVisible(false); + clientArch64RadioButton->setChecked(true); + clientArch32RadioButton->setChecked(false); +#else // check whether OS architecture is 32 or 64 bits if (CConfigFile::has64bitsOS()) { @@ -50,12 +55,7 @@ CInstallDialog::CInstallDialog():QDialog() clientArchGroupBox->setVisible(false); clientArch64RadioButton->setChecked(false); clientArch32RadioButton->setChecked(true); - } -#else - // only 64 bits for OS X - clientArchGroupBox->setVisible(false); - clientArch64RadioButton->setChecked(true); - clientArch32RadioButton->setChecked(false); +} #endif const CServer &server = CConfigFile::getInstance()->getServer(); diff --git a/code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp b/code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp index f60abd95c..d3e9739b4 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp @@ -50,6 +50,11 @@ CMigrateDialog::CMigrateDialog():QDialog() onDestinationDefaultButtonClicked(); #ifdef Q_OS_MAC + // only 64 bits for OS X + clientArchGroupBox->setVisible(false); + clientArch64RadioButton->setChecked(true); + clientArch32RadioButton->setChecked(false); +#else // check whether OS architecture is 32 or 64 bits if (CConfigFile::has64bitsOS()) { @@ -65,11 +70,6 @@ CMigrateDialog::CMigrateDialog():QDialog() clientArch64RadioButton->setChecked(false); clientArch32RadioButton->setChecked(true); } -#else - // only 64 bits for OS X - clientArchGroupBox->setVisible(false); - clientArch64RadioButton->setChecked(true); - clientArch32RadioButton->setChecked(false); #endif const CServer &server = CConfigFile::getInstance()->getServer();