diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-01-04 16:42:29 +0100 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-01-06 17:14:09 +0000 |
| commit | e8b8de4460235c458ab5c8e3249982628e9541bd (patch) | |
| tree | 078da79e69ec0c5cfebf6bd4139d2afdaf6c84cd /tests/auto/quick/qquicktext | |
| parent | 781caafe1fde71b059c0e3a42bda77ce0d7e4c2a (diff) | |
Raise minimum supported MSVC version to 2015
Remove code for older versions and streamline #ifdefs.
Remove the helpers macros Q_STATIC_ASSERT_FOR_SANE_COMPILERS
and V4_ASSERT_IS_TRIVIAL.
Task-number: QTBUG-40658
Task-number: QTBUG-51673
Change-Id: Ifa4fab653b10ce7858739adef08364cddc6507cf
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests/auto/quick/qquicktext')
| -rw-r--r-- | tests/auto/quick/qquicktext/tst_qquicktext.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
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(); |