From 7cc6d85df906f6780fc2a7055938580b4ee51d8a Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Sun, 20 Mar 2016 09:09:38 +0100 Subject: Fix C++11 compile error with version strings. C++11 requires a space between literal and identifier. When compiling with Qt 5.6 on OS X C++11 support is automatically enabled, causing an error due to this. Change-Id: Ifbedc894a3cef23fc67ed1da75558e92e44d1077 --- rbutil/rbutilqt/rbutilqt.cpp | 2 +- rbutil/rbutilqt/version.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index aec7d273c4..e14bb25d7b 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp @@ -86,7 +86,7 @@ RbUtilQt::RbUtilQt(QWidget *parent) : QMainWindow(parent) QString c = RbSettings::value(RbSettings::CachePath).toString(); HttpGet::setGlobalCache(c.isEmpty() ? QDir::tempPath() : c); - HttpGet::setGlobalUserAgent("rbutil/"VERSION); + HttpGet::setGlobalUserAgent("rbutil/" VERSION); HttpGet::setGlobalProxy(proxy()); // init startup & autodetection ui.setupUi(this); diff --git a/rbutil/rbutilqt/version.h b/rbutil/rbutilqt/version.h index e3e46a932d..a156083f67 100644 --- a/rbutil/rbutilqt/version.h +++ b/rbutil/rbutilqt/version.h @@ -40,5 +40,5 @@ // PUREVERSION should identify the build uniquely. Use version string for now. #define PUREVERSION "$Rev$" -#define FULLVERSION VERSION" ("PUREVERSION"), built "__DATE__" "__TIME__ +#define FULLVERSION VERSION " (" PUREVERSION "), built " __DATE__ " " __TIME__ -- cgit v1.2.3