diff options
| author | Robert Loehning <robert.loehning@digia.com> | 2014-10-24 16:04:18 +0200 |
|---|---|---|
| committer | hjk <hjk121@nokiamail.com> | 2014-11-03 10:56:48 +0100 |
| commit | f44aee5da0ae261fbc2ae53d552daf7dcbdb6ea0 (patch) | |
| tree | b64d312862f7a8dfd618cf9f3b13a02031f7490d /tests/manual/debugger | |
| parent | d2160e5bcea0055dfbb6be66220b24f8a2aafcee (diff) | |
Debugger: Make simple test compile with old Qt and MSVC
Change-Id: Ibef0886f059a4807af9ad0e7922b37835da75efb
Reviewed-by: hjk <hjk121@nokiamail.com>
Diffstat (limited to 'tests/manual/debugger')
| -rw-r--r-- | tests/manual/debugger/simple/simple_test_app.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/tests/manual/debugger/simple/simple_test_app.cpp b/tests/manual/debugger/simple/simple_test_app.cpp index e01688e6d6c..d7d869a6174 100644 --- a/tests/manual/debugger/simple/simple_test_app.cpp +++ b/tests/manual/debugger/simple/simple_test_app.cpp @@ -175,7 +175,9 @@ void dummyStatement(...) {} #include <QStandardItemModel> #include <QTextCursor> #include <QTextDocument> -#include <QTimeZone> +# if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0) +# include <QTimeZone> +# endif #endif #if USE_SCRIPTLIB @@ -718,10 +720,12 @@ namespace qdatetime { void testQTimeZone() { +#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0) QTimeZone zz; QTimeZone tz("UTC+05:00"); BREAK_HERE; dummyStatement(&zz, &tz); +#endif } void testQDate() @@ -3258,9 +3262,11 @@ namespace stdmap { void testStdMultiSetInt() { +#ifndef Q_CC_MSVC std::multiset<int> set = {1, 1, 2, 3, 3, 3}; BREAK_HERE; dummyStatement(&set); +#endif } void testStdMap() @@ -5522,11 +5528,13 @@ namespace basic { void testLongEvaluation1() { - QTimeZone tz("UTC+05:00"); QDateTime time = QDateTime::currentDateTime(); const int N = 10000; QDateTime x = time; +#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0) + QTimeZone tz("UTC+05:00"); x.setTimeZone(tz); +#endif QDateTime bigv[N]; for (int i = 0; i < 10000; ++i) { bigv[i] = time; |