From fd22e8123b18e52610e36b21f29f3a80850d8dee Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Mon, 30 Jun 2014 15:40:08 -0700 Subject: User survey: detect the machine the app is running on We build 32bit Windows binaries - but we really want to know if the OS is x86_64 or i386. This little hack should give us that information. Signed-off-by: Dirk Hohndel --- qt-ui/usersurvey.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'qt-ui/usersurvey.cpp') diff --git a/qt-ui/usersurvey.cpp b/qt-ui/usersurvey.cpp index f08168ed3..0a97fdb78 100644 --- a/qt-ui/usersurvey.cpp +++ b/qt-ui/usersurvey.cpp @@ -14,6 +14,7 @@ UserSurvey::UserSurvey(QWidget *parent) : QDialog(parent), ui(new Ui::UserSurvey) { + QString osArch, arch; ui->setupUi(this); QShortcut *closeKey = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_W), this); connect(closeKey, SIGNAL(activated()), this, SLOT(close())); @@ -25,8 +26,16 @@ UserSurvey::UserSurvey(QWidget *parent) : QDialog(parent), os = QString("ssrfVers=%1").arg(VERSION_STRING); sysInfo.append(tr("\nOperating System: %1").arg(SubsurfaceSysInfo::prettyOsName())); os.append(QString("&prettyOsName=%1").arg(SubsurfaceSysInfo::prettyOsName())); - sysInfo.append(tr("\nCPU Architecture: %1").arg(SubsurfaceSysInfo::cpuArchitecture())); - os.append(QString("&cpuArch=%1").arg(SubsurfaceSysInfo::cpuArchitecture())); + arch = SubsurfaceSysInfo::cpuArchitecture(); + sysInfo.append(tr("\nCPU Architecture: %1").arg(arch)); + os.append(QString("&appCpuArch=%1").arg(arch)); + if (arch == "i386") { + osArch = SubsurfaceSysInfo::osArch(); + if (!osArch.isEmpty()) { + sysInfo.append(tr("\nOS CPU Architecture %1").arg(osArch)); + os.append(QString("&osCpuArch=%1").arg(osArch)); + } + } sysInfo.append(tr("\nLanguage: %1").arg(uiLanguage(NULL))); os.append(QString("&uiLang=%1").arg(uiLanguage(NULL))); ui->system->setPlainText(sysInfo); -- cgit v1.2.3-70-g09d2