diff options
author | Christian Kandeler <[email protected]> | 2014-08-29 13:18:41 +0200 |
---|---|---|
committer | Christian Kandeler <[email protected]> | 2014-09-08 10:33:25 +0200 |
commit | 847f10e9ccc8c3541782a790e04c85c6b4c701da (patch) | |
tree | e59ebac8dfb77c88d8e5540855836ca79a9a7a91 /src/plugins/debugger/debuggerprotocol.cpp | |
parent | 6f58e5b798e368e6254cc837e489bd8fd8f066e9 (diff) |
Remove Qt version checks.
Qt 5.3 is the minimum requirement these days. Remove all fallback code
from sources and project files.
Change-Id: If6188a471197acadda4d6baee71804ba1a8026c6
Reviewed-by: Eike Ziller <[email protected]>
Diffstat (limited to 'src/plugins/debugger/debuggerprotocol.cpp')
-rw-r--r-- | src/plugins/debugger/debuggerprotocol.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/plugins/debugger/debuggerprotocol.cpp b/src/plugins/debugger/debuggerprotocol.cpp index 1897527e49e..fa25363005e 100644 --- a/src/plugins/debugger/debuggerprotocol.cpp +++ b/src/plugins/debugger/debuggerprotocol.cpp @@ -34,9 +34,7 @@ #include <QDebug> #include <QHostAddress> #include <QRegExp> -#if QT_VERSION >= 0x050200 #include <QTimeZone> -#endif #include <ctype.h> @@ -512,7 +510,6 @@ static QTime timeFromData(int ms) return ms == -1 ? QTime() : QTime(0, 0, 0, 0).addMSecs(ms); } -#if QT_VERSION >= 0x050200 // Stolen and adapted from qdatetime.cpp static void getDateTime(qint64 msecs, int status, QDate *date, QTime *time) { @@ -559,7 +556,6 @@ static void getDateTime(qint64 msecs, int status, QDate *date, QTime *time) *date = (status & NullDate) ? QDate() : QDate::fromJulianDay(jd); *time = (status & NullTime) ? QTime() : QTime::fromMSecsSinceStartOfDay(ds); } -#endif QString decodeData(const QByteArray &ba, int encoding) { @@ -688,7 +684,6 @@ QString decodeData(const QByteArray &ba, int encoding) return QString::fromUtf8(decodedBa); } case DateTimeInternal: { // 29, DateTimeInternal: msecs, spec, offset, tz, status -#if QT_VERSION >= 0x050200 int p0 = ba.indexOf('/'); int p1 = ba.indexOf('/', p0 + 1); int p2 = ba.indexOf('/', p1 + 1); @@ -719,10 +714,6 @@ QString decodeData(const QByteArray &ba, int encoding) dateTime = QDateTime(date, time, spec); } return dateTime.toString(); -#else - // "Very plain". - return QString::fromLatin1(ba); -#endif } } qDebug() << "ENCODING ERROR: " << encoding; |