summaryrefslogtreecommitdiffstats
path: root/rbutil
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2016-03-20 09:09:38 +0100
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2016-03-27 12:38:17 +0200
commit7cc6d85df906f6780fc2a7055938580b4ee51d8a (patch)
treecd50b4dc3b7185e51bd03540add9293aaaf4eb96 /rbutil
parentece9303c2bb377f83b773e45ee1f6d630678e5ab (diff)
downloadrockbox-7cc6d85df906f6780fc2a7055938580b4ee51d8a.tar.gz
rockbox-7cc6d85df906f6780fc2a7055938580b4ee51d8a.tar.bz2
rockbox-7cc6d85df906f6780fc2a7055938580b4ee51d8a.zip
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
Diffstat (limited to 'rbutil')
-rw-r--r--rbutil/rbutilqt/rbutilqt.cpp2
-rw-r--r--rbutil/rbutilqt/version.h2
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__