mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-12-24 01:48:44 +00:00
Merge with develop
This commit is contained in:
parent
ad26721df6
commit
975a8f2d53
2 changed files with 11 additions and 11 deletions
|
@ -36,6 +36,11 @@ CInstallDialog::CInstallDialog():QDialog()
|
||||||
onDestinationDefaultButtonClicked();
|
onDestinationDefaultButtonClicked();
|
||||||
|
|
||||||
#ifdef Q_OS_MAC
|
#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
|
// check whether OS architecture is 32 or 64 bits
|
||||||
if (CConfigFile::has64bitsOS())
|
if (CConfigFile::has64bitsOS())
|
||||||
{
|
{
|
||||||
|
@ -50,12 +55,7 @@ CInstallDialog::CInstallDialog():QDialog()
|
||||||
clientArchGroupBox->setVisible(false);
|
clientArchGroupBox->setVisible(false);
|
||||||
clientArch64RadioButton->setChecked(false);
|
clientArch64RadioButton->setChecked(false);
|
||||||
clientArch32RadioButton->setChecked(true);
|
clientArch32RadioButton->setChecked(true);
|
||||||
}
|
}
|
||||||
#else
|
|
||||||
// only 64 bits for OS X
|
|
||||||
clientArchGroupBox->setVisible(false);
|
|
||||||
clientArch64RadioButton->setChecked(true);
|
|
||||||
clientArch32RadioButton->setChecked(false);
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
const CServer &server = CConfigFile::getInstance()->getServer();
|
const CServer &server = CConfigFile::getInstance()->getServer();
|
||||||
|
|
|
@ -50,6 +50,11 @@ CMigrateDialog::CMigrateDialog():QDialog()
|
||||||
onDestinationDefaultButtonClicked();
|
onDestinationDefaultButtonClicked();
|
||||||
|
|
||||||
#ifdef Q_OS_MAC
|
#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
|
// check whether OS architecture is 32 or 64 bits
|
||||||
if (CConfigFile::has64bitsOS())
|
if (CConfigFile::has64bitsOS())
|
||||||
{
|
{
|
||||||
|
@ -65,11 +70,6 @@ CMigrateDialog::CMigrateDialog():QDialog()
|
||||||
clientArch64RadioButton->setChecked(false);
|
clientArch64RadioButton->setChecked(false);
|
||||||
clientArch32RadioButton->setChecked(true);
|
clientArch32RadioButton->setChecked(true);
|
||||||
}
|
}
|
||||||
#else
|
|
||||||
// only 64 bits for OS X
|
|
||||||
clientArchGroupBox->setVisible(false);
|
|
||||||
clientArch64RadioButton->setChecked(true);
|
|
||||||
clientArch32RadioButton->setChecked(false);
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
const CServer &server = CConfigFile::getInstance()->getServer();
|
const CServer &server = CConfigFile::getInstance()->getServer();
|
||||||
|
|
Loading…
Reference in a new issue