diff options
| author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2016-03-20 09:09:38 +0100 |
|---|---|---|
| committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2016-03-27 12:38:17 +0200 |
| commit | 7cc6d85df906f6780fc2a7055938580b4ee51d8a (patch) | |
| tree | cd50b4dc3b7185e51bd03540add9293aaaf4eb96 | |
| parent | ece9303c2bb377f83b773e45ee1f6d630678e5ab (diff) | |
| download | rockbox-7cc6d85df906f6780fc2a7055938580b4ee51d8a.tar.gz 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
| -rw-r--r-- | rbutil/rbutilqt/rbutilqt.cpp | 2 | ||||
| -rw-r--r-- | 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) | |||
| 86 | 86 | ||
| 87 | QString c = RbSettings::value(RbSettings::CachePath).toString(); | 87 | QString c = RbSettings::value(RbSettings::CachePath).toString(); |
| 88 | HttpGet::setGlobalCache(c.isEmpty() ? QDir::tempPath() : c); | 88 | HttpGet::setGlobalCache(c.isEmpty() ? QDir::tempPath() : c); |
| 89 | HttpGet::setGlobalUserAgent("rbutil/"VERSION); | 89 | HttpGet::setGlobalUserAgent("rbutil/" VERSION); |
| 90 | HttpGet::setGlobalProxy(proxy()); | 90 | HttpGet::setGlobalProxy(proxy()); |
| 91 | // init startup & autodetection | 91 | // init startup & autodetection |
| 92 | ui.setupUi(this); | 92 | 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 @@ | |||
| 40 | // PUREVERSION should identify the build uniquely. Use version string for now. | 40 | // PUREVERSION should identify the build uniquely. Use version string for now. |
| 41 | #define PUREVERSION "$Rev$" | 41 | #define PUREVERSION "$Rev$" |
| 42 | 42 | ||
| 43 | #define FULLVERSION VERSION" ("PUREVERSION"), built "__DATE__" "__TIME__ | 43 | #define FULLVERSION VERSION " (" PUREVERSION "), built " __DATE__ " " __TIME__ |
| 44 | 44 | ||