diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-25 11:41:18 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-25 11:41:19 +0200 |
| commit | 6f5835879141210b386cad710065b644f72049a1 (patch) | |
| tree | e76aac84527548c0af0e45b0da54a93a8597d897 /tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp | |
| parent | eee4167a90c54fa48fb12252741720d9c56f5ec5 (diff) | |
| parent | e83f6aaaa6b1caa59e4dd2c304439e1fb2572d71 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: I309691a541ff0b296fb6bbfbc0761cc1c627573a
Diffstat (limited to 'tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp')
| -rw-r--r-- | tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp b/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp index 1bba41816b..d0a0feb125 100644 --- a/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp +++ b/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp @@ -1738,9 +1738,6 @@ void tst_QSharedPointer::creating() void tst_QSharedPointer::creatingVariadic() { -#if !defined(Q_COMPILER_RVALUE_REFS) || !defined(Q_COMPILER_VARIADIC_TEMPLATES) - QSKIP("This compiler is not in C++11 mode or it doesn't support rvalue refs and variadic templates"); -#else int i = 42; { @@ -1768,12 +1765,10 @@ void tst_QSharedPointer::creatingVariadic() QCOMPARE(ptr->i, 2); QCOMPARE(ptr->ptr, (void*)0); -#ifdef Q_COMPILER_NULLPTR NoDefaultConstructor2(nullptr, 3); // control check ptr = QSharedPointer<NoDefaultConstructor2>::create(nullptr, 3); QCOMPARE(ptr->i, 3); QCOMPARE(ptr->ptr, (void*)nullptr); -#endif } { NoDefaultConstructorRef1 x(i); // control check @@ -1809,7 +1804,6 @@ void tst_QSharedPointer::creatingVariadic() QCOMPARE(ptr->str, QString("bytearray")); QCOMPARE(ptr->i, 42); } -#endif } void tst_QSharedPointer::creatingQObject() |