devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Fix C++11 compile error with version strings.

Browse source 
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
This commit is contained in:
Dominik Riebeling 2016-03-20 09:09:38 +01:00
parent ece9303c2b
commit 7cc6d85df9
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rbutil/rbutilqt/rbutilqt.cpp
View file

@ -86,7 +86,7 @@ RbUtilQt::RbUtilQt(QWidget *parent) : QMainWindow(parent)
QString c = RbSettings::value(RbSettings::CachePath).toString(); QString c = RbSettings::value(RbSettings::CachePath).toString();
HttpGet::setGlobalCache(c.isEmpty() ? QDir::tempPath() : c); HttpGet::setGlobalCache(c.isEmpty() ? QDir::tempPath() : c);
HttpGet::setGlobalUserAgent("rbutil/"VERSION); HttpGet::setGlobalUserAgent("rbutil/" VERSION);
HttpGet::setGlobalProxy(proxy()); HttpGet::setGlobalProxy(proxy());
// init startup & autodetection // init startup & autodetection
ui.setupUi(this); ui.setupUi(this);

2
rbutil/rbutilqt/version.h
View file

@ -40,5 +40,5 @@
// PUREVERSION should identify the build uniquely. Use version string for now. // PUREVERSION should identify the build uniquely. Use version string for now.
#define PUREVERSION "$Rev$" #define PUREVERSION "$Rev$"
#define FULLVERSION VERSION" ("PUREVERSION"), built "__DATE__" "__TIME__ #define FULLVERSION VERSION " (" PUREVERSION "), built " __DATE__ " " __TIME__