diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-01-04 14:36:01 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-01-04 20:23:25 +0000 |
| commit | 5af4cb5a5a3990a284f7114a89bfad87f17e8f13 (patch) | |
| tree | 40c6df770d1c845fa02a16659ff29706cd9d62bb /tests/auto/corelib/tools | |
| parent | 3edcd9420e3ad661cad89420e18dbb70e7ad450b (diff) | |
Tests: Raise minimum supported MSVC version to 2015
Remove code for older versions and streamline #ifdefs.
Task-number: QTBUG-51673
Change-Id: If456567691538b1a1f452111814c5f9eba401c43
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/corelib/tools')
| -rw-r--r-- | tests/auto/corelib/tools/qversionnumber/tst_qversionnumber.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/tests/auto/corelib/tools/qversionnumber/tst_qversionnumber.cpp b/tests/auto/corelib/tools/qversionnumber/tst_qversionnumber.cpp index 9812d93a50..05579dce6e 100644 --- a/tests/auto/corelib/tools/qversionnumber/tst_qversionnumber.cpp +++ b/tests/auto/corelib/tools/qversionnumber/tst_qversionnumber.cpp @@ -586,10 +586,7 @@ void tst_QVersionNumber::serialize() void tst_QVersionNumber::moveSemantics() { -#if defined(_MSC_VER) && _MSC_VER == 1600 -# define Q_MSVC_2010 -#endif -#if defined(Q_COMPILER_RVALUE_REFS) && !defined(Q_MSVC_2010) +#ifdef Q_COMPILER_RVALUE_REFS // QVersionNumber(QVersionNumber &&) { QVersionNumber v1(1, 2, 3); @@ -613,7 +610,7 @@ void tst_QVersionNumber::moveSemantics() QCOMPARE(v1, v2); } #endif -#if defined(Q_COMPILER_REF_QUALIFIERS) && !defined(Q_MSVC_2010) +#ifdef Q_COMPILER_REF_QUALIFIERS // normalized() { QVersionNumber v(1, 0, 0); @@ -639,10 +636,8 @@ void tst_QVersionNumber::moveSemantics() QVERIFY(!segments.empty()); } #endif -#if !defined(Q_COMPILER_RVALUE_REFS) && !defined(Q_COMPILER_REF_QUALIFIERS) && !defined(Q_MSVC_2010) +#if !defined(Q_COMPILER_RVALUE_REFS) && !defined(Q_COMPILER_REF_QUALIFIERS) QSKIP("This test requires C++11 move semantics support in the compiler."); -#elif defined(Q_MSVC_2010) - QSKIP("This test requires compiler generated move constructors and operators."); #endif } |