summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@digia.com>2014-01-23 16:53:30 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-01-26 20:03:34 +0100
commit7d782d4cf9c958d31213ef186ac4013b955c8537 (patch)
treeb783c19d85c0473b14307578e6a126d226d5beb8
parent690761a74d252e56a6cffb7e08015680ba3e2038 (diff)
Fix QArrayData check
The support for QArrayData variadic arguments without C++11 for GCC has been removed in commit 69478da0f0d . Change the autotest to reflect that, too. Change-Id: I40468f5d67cb2db553fd7a7d5b604f46403ac538 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-rw-r--r--tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp b/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp
index a8732e0ce0..f9ce7425f6 100644
--- a/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp
+++ b/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp
@@ -87,8 +87,7 @@ private slots:
void fromRawData_data();
void fromRawData();
void literals();
-#if defined(Q_COMPILER_VARIADIC_MACROS) \
- && (defined(Q_COMPILER_LAMBDA) || defined(Q_CC_GNU))
+#if defined(Q_COMPILER_VARIADIC_MACROS) && defined(Q_COMPILER_LAMBDA)
void variadicLiterals();
#endif
#ifdef Q_COMPILER_RVALUE_REFS
@@ -1555,8 +1554,7 @@ void tst_QArrayData::literals()
QCOMPARE(v.size(), size_t(11));
// v.capacity() is unspecified, for now
-#if defined(Q_COMPILER_VARIADIC_MACROS) \
- && (defined(Q_COMPILER_LAMBDA) || defined(Q_CC_GNU))
+#if defined(Q_COMPILER_VARIADIC_MACROS) && defined(Q_COMPILER_LAMBDA)
QVERIFY(v.isStatic());
#endif
@@ -1569,8 +1567,7 @@ void tst_QArrayData::literals()
}
}
-#if defined(Q_COMPILER_VARIADIC_MACROS) \
- && (defined(Q_COMPILER_LAMBDA) || defined(Q_CC_GNU))
+#if defined(Q_COMPILER_VARIADIC_MACROS) && defined(Q_COMPILER_LAMBDA)
// Variadic Q_ARRAY_LITERAL need to be available in the current configuration.
void tst_QArrayData::variadicLiterals()
{