diff options
-rw-r--r-- | src/qml/jit/qv4assembler.cpp | 13 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4arraydata_p.h | 4 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4context_p.h | 6 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4dateobject.cpp | 2 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4global_p.h | 3 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4managed_p.h | 2 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4memberdata_p.h | 2 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4object_p.h | 2 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4objectiterator_p.h | 2 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4regexp_p.h | 2 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4string_p.h | 2 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4value_p.h | 2 | ||||
-rw-r--r-- | src/qml/memory/qv4heap_p.h | 10 | ||||
-rw-r--r-- | src/qml/memory/qv4mm_p.h | 4 | ||||
-rw-r--r-- | src/qml/memory/qv4writebarrier_p.h | 2 | ||||
-rw-r--r-- | tests/auto/qml/qjsvalue/tst_qjsvalue.cpp | 4 | ||||
-rw-r--r-- | tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp | 4 | ||||
-rw-r--r-- | tests/auto/quick/qquickanimations/BLACKLIST | 34 | ||||
-rw-r--r-- | tests/auto/quick/qquicktext/tst_qquicktext.cpp | 3 |
19 files changed, 20 insertions, 83 deletions
diff --git a/src/qml/jit/qv4assembler.cpp b/src/qml/jit/qv4assembler.cpp index 790598d5c0..956ee76623 100644 --- a/src/qml/jit/qv4assembler.cpp +++ b/src/qml/jit/qv4assembler.cpp @@ -52,15 +52,6 @@ #undef ENABLE_ALL_ASSEMBLERS_FOR_REFACTORING_PURPOSES -#ifdef Q_STATIC_ASSERT_FOR_SANE_COMPILERS -# undef Q_STATIC_ASSERT_FOR_SANE_COMPILERS -#endif -#if defined(Q_CC_MSVC) && _MSC_VER < 1900 -# define Q_STATIC_ASSERT_FOR_SANE_COMPILERS(x) // insane -#else -# define Q_STATIC_ASSERT_FOR_SANE_COMPILERS(x) Q_STATIC_ASSERT(x) -#endif - #ifdef V4_ENABLE_JIT QT_BEGIN_NAMESPACE @@ -2093,7 +2084,7 @@ void Assembler::gotoCatchException() void Assembler::getException() { - Q_STATIC_ASSERT_FOR_SANE_COMPILERS(sizeof(QV4::EngineBase::hasException) == 1); + Q_STATIC_ASSERT(sizeof(QV4::EngineBase::hasException) == 1); Address hasExceptionAddr(PlatformAssembler::EngineRegister, offsetof(EngineBase, hasException)); @@ -2118,7 +2109,7 @@ void Assembler::setException() pasm()->loadPtr(addr, PlatformAssembler::ScratchRegister); pasm()->storeAccumulator(Address(PlatformAssembler::ScratchRegister)); addr.offset = offsetof(EngineBase, hasException); - Q_STATIC_ASSERT_FOR_SANE_COMPILERS(sizeof(QV4::EngineBase::hasException) == 1); + Q_STATIC_ASSERT(sizeof(QV4::EngineBase::hasException) == 1); pasm()->store8(TrustedImm32(1), addr); } diff --git a/src/qml/jsruntime/qv4arraydata_p.h b/src/qml/jsruntime/qv4arraydata_p.h index db9db5a220..46986c5e6f 100644 --- a/src/qml/jsruntime/qv4arraydata_p.h +++ b/src/qml/jsruntime/qv4arraydata_p.h @@ -142,7 +142,7 @@ DECLARE_HEAP_OBJECT(ArrayData, Base) { uint mappedIndex(uint index) const; }; -V4_ASSERT_IS_TRIVIAL(ArrayData) +Q_STATIC_ASSERT(std::is_trivial< ArrayData >::value); struct SimpleArrayData : public ArrayData { uint mappedIndex(uint index) const { index += offset; if (index >= values.alloc) index -= values.alloc; return index; } @@ -157,7 +157,7 @@ struct SimpleArrayData : public ArrayData { return attrs ? attrs[i] : Attr_Data; } }; -V4_ASSERT_IS_TRIVIAL(SimpleArrayData) +Q_STATIC_ASSERT(std::is_trivial< SimpleArrayData >::value); struct SparseArrayData : public ArrayData { void destroy() { diff --git a/src/qml/jsruntime/qv4context_p.h b/src/qml/jsruntime/qv4context_p.h index 4efd0bc899..dfac5534be 100644 --- a/src/qml/jsruntime/qv4context_p.h +++ b/src/qml/jsruntime/qv4context_p.h @@ -143,7 +143,7 @@ DECLARE_HEAP_OBJECT(ExecutionContext, Base) { quint8 padding_[4]; #endif }; -V4_ASSERT_IS_TRIVIAL(ExecutionContext) +Q_STATIC_ASSERT(std::is_trivial< ExecutionContext >::value); Q_STATIC_ASSERT(sizeof(ExecutionContext) == sizeof(Base) + sizeof(ExecutionContextData) + QT_POINTER_SIZE); Q_STATIC_ASSERT(std::is_standard_layout<ExecutionContextData>::value); @@ -170,7 +170,7 @@ DECLARE_HEAP_OBJECT(CallContext, ExecutionContext) { } void setArg(uint index, Value v); }; -V4_ASSERT_IS_TRIVIAL(CallContext) +Q_STATIC_ASSERT(std::is_trivial< CallContext >::value); Q_STATIC_ASSERT(std::is_standard_layout<CallContextData>::value); Q_STATIC_ASSERT(offsetof(CallContextData, function) == 0); //### The following size check fails on Win8. With the ValueArray at the end of the @@ -190,7 +190,7 @@ DECLARE_HEAP_OBJECT(CatchContext, ExecutionContext) { void init(ExecutionContext *outerContext, String *exceptionVarName, const Value &exceptionValue); }; -V4_ASSERT_IS_TRIVIAL(CatchContext) +Q_STATIC_ASSERT(std::is_trivial< CatchContext >::value); } diff --git a/src/qml/jsruntime/qv4dateobject.cpp b/src/qml/jsruntime/qv4dateobject.cpp index b8392d27e9..d56db80c3f 100644 --- a/src/qml/jsruntime/qv4dateobject.cpp +++ b/src/qml/jsruntime/qv4dateobject.cpp @@ -328,7 +328,7 @@ static inline double DaylightSavingTA(double t) // t is a UTC time static inline double DaylightSavingTA(double t) { struct tm tmtm; -#if defined(_MSC_VER) && _MSC_VER >= 1400 +#if defined(Q_CC_MSVC) __time64_t tt = (__time64_t)(t / msPerSecond); // _localtime_64_s returns non-zero on failure if (_localtime64_s(&tmtm, &tt) != 0) diff --git a/src/qml/jsruntime/qv4global_p.h b/src/qml/jsruntime/qv4global_p.h index 090a164ef6..07c88a2814 100644 --- a/src/qml/jsruntime/qv4global_p.h +++ b/src/qml/jsruntime/qv4global_p.h @@ -76,9 +76,6 @@ namespace std { inline bool isinf(double d) { return !_finite(d) && !_isnan(d); } inline bool isnan(double d) { return !!_isnan(d); } inline bool isfinite(double d) { return _finite(d); } -#if _MSC_VER < 1800 -inline bool signbit(double d) { return _copysign(1.0, d) < 0; } -#endif } // namespace std diff --git a/src/qml/jsruntime/qv4managed_p.h b/src/qml/jsruntime/qv4managed_p.h index f81dcf9479..092c61b81c 100644 --- a/src/qml/jsruntime/qv4managed_p.h +++ b/src/qml/jsruntime/qv4managed_p.h @@ -93,7 +93,7 @@ inline void qYouForgotTheQ_MANAGED_Macro(T1, T2) {} dptr->_checkIsInitialized(); \ return dptr; \ } \ - V4_ASSERT_IS_TRIVIAL(QV4::Heap::DataClass) + Q_STATIC_ASSERT(std::is_trivial< QV4::Heap::DataClass >::value); #define V4_MANAGED(DataClass, superClass) \ private: \ diff --git a/src/qml/jsruntime/qv4memberdata_p.h b/src/qml/jsruntime/qv4memberdata_p.h index 3e231d693b..7345790ac3 100644 --- a/src/qml/jsruntime/qv4memberdata_p.h +++ b/src/qml/jsruntime/qv4memberdata_p.h @@ -65,7 +65,7 @@ namespace Heap { DECLARE_HEAP_OBJECT(MemberData, Base) { DECLARE_MARKOBJECTS(MemberData); }; -V4_ASSERT_IS_TRIVIAL(MemberData) +Q_STATIC_ASSERT(std::is_trivial< MemberData >::value); } diff --git a/src/qml/jsruntime/qv4object_p.h b/src/qml/jsruntime/qv4object_p.h index 66177617f7..60012822d8 100644 --- a/src/qml/jsruntime/qv4object_p.h +++ b/src/qml/jsruntime/qv4object_p.h @@ -153,7 +153,7 @@ DECLARE_EXPORTED_HEAP_OBJECT(Object, Base) { dptr->_checkIsInitialized(); \ return dptr; \ } \ - V4_ASSERT_IS_TRIVIAL(QV4::Heap::DataClass); + Q_STATIC_ASSERT(std::is_trivial< QV4::Heap::DataClass >::value); #define V4_PROTOTYPE(p) \ static QV4::Object *defaultPrototype(QV4::ExecutionEngine *e) \ diff --git a/src/qml/jsruntime/qv4objectiterator_p.h b/src/qml/jsruntime/qv4objectiterator_p.h index 30a6ad3025..3e501f23ce 100644 --- a/src/qml/jsruntime/qv4objectiterator_p.h +++ b/src/qml/jsruntime/qv4objectiterator_p.h @@ -73,7 +73,7 @@ struct Q_QML_EXPORT ObjectIteratorData uint memberIndex; uint flags; }; -V4_ASSERT_IS_TRIVIAL(ObjectIteratorData) +Q_STATIC_ASSERT(std::is_trivial< ObjectIteratorData >::value); struct Q_QML_EXPORT ObjectIterator: ObjectIteratorData { diff --git a/src/qml/jsruntime/qv4regexp_p.h b/src/qml/jsruntime/qv4regexp_p.h index 498468e165..94bebbd931 100644 --- a/src/qml/jsruntime/qv4regexp_p.h +++ b/src/qml/jsruntime/qv4regexp_p.h @@ -100,7 +100,7 @@ struct RegExp : Base { int captureCount() const { return subPatternCount + 1; } }; -V4_ASSERT_IS_TRIVIAL(RegExp) +Q_STATIC_ASSERT(std::is_trivial< RegExp >::value); } diff --git a/src/qml/jsruntime/qv4string_p.h b/src/qml/jsruntime/qv4string_p.h index 85345aca4d..9053d9d48f 100644 --- a/src/qml/jsruntime/qv4string_p.h +++ b/src/qml/jsruntime/qv4string_p.h @@ -131,7 +131,7 @@ private: static void append(const String *data, QChar *ch); #endif }; -V4_ASSERT_IS_TRIVIAL(String) +Q_STATIC_ASSERT(std::is_trivial< String >::value); } diff --git a/src/qml/jsruntime/qv4value_p.h b/src/qml/jsruntime/qv4value_p.h index 52d9f23afd..a0495cca61 100644 --- a/src/qml/jsruntime/qv4value_p.h +++ b/src/qml/jsruntime/qv4value_p.h @@ -483,7 +483,7 @@ public: template<typename T> Value &operator=(const Scoped<T> &t); }; -V4_ASSERT_IS_TRIVIAL(Value) +Q_STATIC_ASSERT(std::is_trivial< Value >::value); inline void Value::mark(MarkStack *markStack) { diff --git a/src/qml/memory/qv4heap_p.h b/src/qml/memory/qv4heap_p.h index 363e891d5c..7bc841b21d 100644 --- a/src/qml/memory/qv4heap_p.h +++ b/src/qml/memory/qv4heap_p.h @@ -60,12 +60,6 @@ // parent's init all up the inheritance chain), define QML_CHECK_INIT_DESTROY_CALLS below. #undef QML_CHECK_INIT_DESTROY_CALLS -#if defined(_MSC_VER) && (_MSC_VER < 1900) // broken compilers: -# define V4_ASSERT_IS_TRIVIAL(x) -#else // working compilers: -# define V4_ASSERT_IS_TRIVIAL(x) Q_STATIC_ASSERT(std::is_trivial< x >::value); -#endif - QT_BEGIN_NAMESPACE namespace QV4 { @@ -175,7 +169,7 @@ struct Q_QML_EXPORT Base { Q_ALWAYS_INLINE void _setDestroyed() {} #endif }; -V4_ASSERT_IS_TRIVIAL(Base) +Q_STATIC_ASSERT(std::is_trivial< Base >::value); // This class needs to consist only of pointer sized members to allow // for a size/offset translation when cross-compiling between 32- and // 64-bit. @@ -253,7 +247,7 @@ private: QtSharedPointer::ExternalRefCountData *d; QObject *qObject; }; -V4_ASSERT_IS_TRIVIAL(QQmlQPointer<QObject>) +Q_STATIC_ASSERT(std::is_trivial< QQmlQPointer<QObject> >::value); #endif } diff --git a/src/qml/memory/qv4mm_p.h b/src/qml/memory/qv4mm_p.h index 921fea3956..f7c50ff3cf 100644 --- a/src/qml/memory/qv4mm_p.h +++ b/src/qml/memory/qv4mm_p.h @@ -169,7 +169,7 @@ public: template<typename ManagedType> inline typename ManagedType::Data *allocManaged(std::size_t size) { - V4_ASSERT_IS_TRIVIAL(typename ManagedType::Data) + Q_STATIC_ASSERT(std::is_trivial< typename ManagedType::Data >::value); size = align(size); Heap::Base *o = allocData(size); InternalClass *ic = ManagedType::defaultInternalClass(engine); @@ -182,7 +182,7 @@ public: template<typename ManagedType> inline typename ManagedType::Data *allocManaged(std::size_t size, InternalClass *ic) { - V4_ASSERT_IS_TRIVIAL(typename ManagedType::Data) + Q_STATIC_ASSERT(std::is_trivial< typename ManagedType::Data >::value); size = align(size); Heap::Base *o = allocData(size); o->internalClass = ic; diff --git a/src/qml/memory/qv4writebarrier_p.h b/src/qml/memory/qv4writebarrier_p.h index c0f4b0b29a..39413a6f09 100644 --- a/src/qml/memory/qv4writebarrier_p.h +++ b/src/qml/memory/qv4writebarrier_p.h @@ -138,7 +138,7 @@ private: Heap::Base *ptr; }; typedef Pointer<char *, 0> V4PointerCheck; -V4_ASSERT_IS_TRIVIAL(V4PointerCheck) +Q_STATIC_ASSERT(std::is_trivial< V4PointerCheck >::value); } diff --git a/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp b/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp index 12c33909cf..db99c44261 100644 --- a/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp +++ b/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp @@ -970,10 +970,6 @@ void tst_QJSValue::toUInt() QCOMPARE(qjsvalue_cast<quint32>(inv), quint32(0)); } -#if defined Q_CC_MSVC && _MSC_VER < 1300 -Q_DECLARE_METATYPE(QVariant) -#endif - void tst_QJSValue::toVariant() { QJSEngine eng; diff --git a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp index 71bb357a43..90bff510e0 100644 --- a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp +++ b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp @@ -6249,10 +6249,6 @@ void tst_qqmlecmascript::include() void tst_qqmlecmascript::includeRemoteSuccess() { -#if defined(Q_CC_MSVC) && _MSC_VER == 1700 - QSKIP("This test does not work reliably with MSVC2012 on Win8 64-bit in release mode."); -#endif - // Remote - success TestHTTPServer server; QVERIFY2(server.listen(), qPrintable(server.errorString())); diff --git a/tests/auto/quick/qquickanimations/BLACKLIST b/tests/auto/quick/qquickanimations/BLACKLIST index e45c141d17..e011db46b7 100644 --- a/tests/auto/quick/qquickanimations/BLACKLIST +++ b/tests/auto/quick/qquickanimations/BLACKLIST @@ -1,40 +1,6 @@ # QTBUG-45466 QTBUG-29062 [simpleProperty] osx-10.9 developer-build -[badTypes] -windows msvc-2010 32bit developer-build -[mixedTypes] -windows msvc-2010 32bit developer-build -[properties] -windows msvc-2010 32bit developer-build -[propertiesTransition] -windows msvc-2010 32bit developer-build -[pathTransition] -windows msvc-2010 32bit developer-build -[disabledTransition] -windows msvc-2010 32bit developer-build -[rotation] -windows msvc-2010 32bit developer-build -[startStopSignals] -windows msvc-2010 32bit developer-build -[runningTrueBug] -windows msvc-2010 32bit developer-build -[nonTransitionBug] -windows msvc-2010 32bit developer-build -[registrationBug] -windows msvc-2010 32bit developer-build -[alwaysRunToEndRestartBug] -windows msvc-2010 32bit developer-build -[loopingBug] -windows msvc-2010 32bit developer-build -[pathAnimationInOutBackBug] -windows msvc-2010 32bit developer-build -[reparent] -windows msvc-2012 64bit developer-build -windows msvc-2010 32bit developer-build -[simpleAnchor] -windows msvc-2010 32bit developer-build [simplePath] windows gcc developer-build -windows msvc-2010 32bit developer-build diff --git a/tests/auto/quick/qquicktext/tst_qquicktext.cpp b/tests/auto/quick/qquicktext/tst_qquicktext.cpp index 51c04a109d..6fa898e9fb 100644 --- a/tests/auto/quick/qquicktext/tst_qquicktext.cpp +++ b/tests/auto/quick/qquicktext/tst_qquicktext.cpp @@ -958,9 +958,6 @@ static inline QByteArray msgNotLessThan(int n1, int n2) void tst_qquicktext::hAlignImplicitWidth() { -#if defined(QT_OPENGL_ES_2_ANGLE) && _MSC_VER==1600 - QSKIP("QTBUG-40658"); -#endif QQuickView view(testFileUrl("hAlignImplicitWidth.qml")); view.setFlags(view.flags() | Qt::WindowStaysOnTopHint); // Prevent being obscured by other windows. view.show(); |