From 2882a1ef412643ae29bf4dca12195063764393ff Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sun, 20 Dec 2015 07:59:50 -0800 Subject: Remove the non-canonical Subusrface version It no longer makes sense to lie about the version. If you are running a product build, then the canonical version is the same version as the plain version used to be. And in either case it makes much more sense to simply log the full version information. We used to have the differently styled versions for different OSs, but I don't think this is needed anymore. Let's hope this doesn't go down as one of these "famous last words" moments... Signed-off-by: Dirk Hohndel --- desktop-widgets/usersurvey.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'desktop-widgets/usersurvey.cpp') diff --git a/desktop-widgets/usersurvey.cpp b/desktop-widgets/usersurvey.cpp index 2d5d5b07e..6dba30d8b 100644 --- a/desktop-widgets/usersurvey.cpp +++ b/desktop-widgets/usersurvey.cpp @@ -22,7 +22,7 @@ UserSurvey::UserSurvey(QWidget *parent) : QDialog(parent), QShortcut *quitKey = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q), this); connect(quitKey, SIGNAL(activated()), parent, SLOT(close())); - os = QString("ssrfVers=%1").arg(subsurface_version()); + os = QString("ssrfVers=%1").arg(subsurface_canonical_version()); os.append(QString("&prettyOsName=%1").arg(SubsurfaceSysInfo::prettyOsName())); QString arch = SubsurfaceSysInfo::buildCpuArchitecture(); os.append(QString("&appCpuArch=%1").arg(arch)); @@ -39,7 +39,7 @@ QString UserSurvey::getVersion() { QString arch; // fill in the system data - QString sysInfo = QString("Subsurface %1").arg(subsurface_version()); + QString sysInfo = QString("Subsurface %1").arg(subsurface_canonical_version()); sysInfo.append(tr("\nOperating system: %1").arg(SubsurfaceSysInfo::prettyOsName())); arch = SubsurfaceSysInfo::buildCpuArchitecture(); sysInfo.append(tr("\nCPU architecture: %1").arg(arch)); -- cgit v1.2.3-70-g09d2