diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-06 08:34:03 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-06 09:04:55 +0200 |
| commit | 57057f76add416d0faf2e09a90c126baafb6198e (patch) | |
| tree | 07d54f8e5daeb3ed1161723542e94c324d745166 /tests/auto/other/compiler | |
| parent | dc0ae02ebc8e221f952829230c0301a718a6f10b (diff) | |
| parent | fd70978693bd92761e9989bc1c76bf83c1e8c987 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
.qmake.conf
config.tests/unix/nis/nis.cpp
mkspecs/unsupported/freebsd-g++/qplatformdefs.h
src/corelib/tools/qdatetime.cpp
src/corelib/tools/qsimd.cpp
src/corelib/tools/qsimd_p.h
src/network/access/access.pri
src/network/access/qnetworkreplynsurlconnectionimpl.mm
src/network/access/qnetworkreplynsurlconnectionimpl_p.h
src/plugins/platforms/cocoa/qnsview.mm
src/plugins/printsupport/windows/qwindowsprintdevice.cpp
tests/auto/corelib/kernel/qobject/tst_qobject.cpp
tests/auto/network/access/qnetworkreply/BLACKLIST
tests/auto/widgets/widgets/qopenglwidget/BLACKLIST
Change-Id: I4b32055bbf922392ef0264fd403405416fffee57
Diffstat (limited to 'tests/auto/other/compiler')
| -rw-r--r-- | tests/auto/other/compiler/tst_compiler.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/auto/other/compiler/tst_compiler.cpp b/tests/auto/other/compiler/tst_compiler.cpp index 50cfe48cdf..55fab00156 100644 --- a/tests/auto/other/compiler/tst_compiler.cpp +++ b/tests/auto/other/compiler/tst_compiler.cpp @@ -631,9 +631,10 @@ void tst_Compiler::cxx11_alignas() #ifndef Q_COMPILER_ALIGNAS QSKIP("Compiler does not support C++11 feature"); #else - alignas(double) char c; - Q_UNUSED(c); - QCOMPARE(Q_ALIGNOF(c), Q_ALIGNOF(double)); + struct S { + alignas(double) char c; + }; + QCOMPARE(Q_ALIGNOF(S), Q_ALIGNOF(double)); #endif } |