mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-11-17 13:01:42 +00:00
Merge with develop
This commit is contained in:
parent
e67d86eeda
commit
4b6e360e22
2 changed files with 37 additions and 3 deletions
|
@ -40,7 +40,9 @@ CInstallDialog::CInstallDialog():QDialog()
|
||||||
clientArchGroupBox->setVisible(false);
|
clientArchGroupBox->setVisible(false);
|
||||||
clientArch64RadioButton->setChecked(true);
|
clientArch64RadioButton->setChecked(true);
|
||||||
clientArch32RadioButton->setChecked(false);
|
clientArch32RadioButton->setChecked(false);
|
||||||
#else
|
#elif defined(Q_OS_WIN32)
|
||||||
|
// both 32 and 64 bits are working under Windows 64 bits
|
||||||
|
|
||||||
// check whether OS architecture is 32 or 64 bits
|
// check whether OS architecture is 32 or 64 bits
|
||||||
if (CConfigFile::has64bitsOS())
|
if (CConfigFile::has64bitsOS())
|
||||||
{
|
{
|
||||||
|
@ -55,7 +57,22 @@ CInstallDialog::CInstallDialog():QDialog()
|
||||||
clientArchGroupBox->setVisible(false);
|
clientArchGroupBox->setVisible(false);
|
||||||
clientArch64RadioButton->setChecked(false);
|
clientArch64RadioButton->setChecked(false);
|
||||||
clientArch32RadioButton->setChecked(true);
|
clientArch32RadioButton->setChecked(true);
|
||||||
}
|
}
|
||||||
|
#else
|
||||||
|
// only use the current architecture for Linux
|
||||||
|
|
||||||
|
clientArchGroupBox->setVisible(false);
|
||||||
|
|
||||||
|
#ifdef _LP64
|
||||||
|
// only 64 bits is available
|
||||||
|
clientArch64RadioButton->setChecked(true);
|
||||||
|
clientArch32RadioButton->setChecked(false);
|
||||||
|
#else
|
||||||
|
// only 32 bits is available
|
||||||
|
clientArch64RadioButton->setChecked(false);
|
||||||
|
clientArch32RadioButton->setChecked(true);
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
const CServer &server = CConfigFile::getInstance()->getServer();
|
const CServer &server = CConfigFile::getInstance()->getServer();
|
||||||
|
|
|
@ -54,7 +54,9 @@ CMigrateDialog::CMigrateDialog():QDialog()
|
||||||
clientArchGroupBox->setVisible(false);
|
clientArchGroupBox->setVisible(false);
|
||||||
clientArch64RadioButton->setChecked(true);
|
clientArch64RadioButton->setChecked(true);
|
||||||
clientArch32RadioButton->setChecked(false);
|
clientArch32RadioButton->setChecked(false);
|
||||||
#else
|
#elif defined(Q_OS_WIN32)
|
||||||
|
// both 32 and 64 bits are working under Windows 64 bits
|
||||||
|
|
||||||
// check whether OS architecture is 32 or 64 bits
|
// check whether OS architecture is 32 or 64 bits
|
||||||
if (CConfigFile::has64bitsOS())
|
if (CConfigFile::has64bitsOS())
|
||||||
{
|
{
|
||||||
|
@ -70,6 +72,21 @@ CMigrateDialog::CMigrateDialog():QDialog()
|
||||||
clientArch64RadioButton->setChecked(false);
|
clientArch64RadioButton->setChecked(false);
|
||||||
clientArch32RadioButton->setChecked(true);
|
clientArch32RadioButton->setChecked(true);
|
||||||
}
|
}
|
||||||
|
#else
|
||||||
|
// only use the current architecture for Linux
|
||||||
|
|
||||||
|
clientArchGroupBox->setVisible(false);
|
||||||
|
|
||||||
|
#ifdef _LP64
|
||||||
|
// only 64 bits is available
|
||||||
|
clientArch64RadioButton->setChecked(true);
|
||||||
|
clientArch32RadioButton->setChecked(false);
|
||||||
|
#else
|
||||||
|
// only 32 bits is available
|
||||||
|
clientArch64RadioButton->setChecked(false);
|
||||||
|
clientArch32RadioButton->setChecked(true);
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
const CServer &server = CConfigFile::getInstance()->getServer();
|
const CServer &server = CConfigFile::getInstance()->getServer();
|
||||||
|
|
Loading…
Reference in a new issue