diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-20 14:09:00 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-21 08:39:41 +0200 |
| commit | ea438b2508f329698e11c6dae6994d441c6e67df (patch) | |
| tree | 7a6052b98ba1ff6e0258c52cfc2726e197f53dd2 /config.tests/arch/arch.cpp | |
| parent | a2f319e9fb2f7595fc16d0d79e26438463051a53 (diff) | |
| parent | 5f0ec7305e4310123ddeb98d3523087e3c560d9c (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
src/corelib/global/qglobal.cpp
src/corelib/global/qsysinfo.h
src/corelib/kernel/qcoreapplication_win.cpp
src/gui/text/qdistancefield.cpp
src/gui/text/qdistancefield_p.h
src/plugins/platforms/windows/qwindowsglcontext.cpp
src/plugins/platforms/windows/qwindowsglcontext.h
Change-Id: Ib3500acc2b28553bde06758cd9a2e19eb7fe2978
Diffstat (limited to 'config.tests/arch/arch.cpp')
| -rw-r--r-- | config.tests/arch/arch.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/config.tests/arch/arch.cpp b/config.tests/arch/arch.cpp index c8e6cb335b..f99c5ca118 100644 --- a/config.tests/arch/arch.cpp +++ b/config.tests/arch/arch.cpp @@ -276,6 +276,12 @@ const char msg2[] = "==Qt=magic=Qt== Sub-architecture:" #ifdef __ALTIVEC__ " altivec" #endif +#ifdef __SPE__ +" spe" +#endif +#ifdef __VSX__ +" vsx" +#endif ""; int main() |