diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-08-02 22:49:38 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-08-02 22:52:32 +0200 |
| commit | ee07b912a1768ea0b103544f9eeac41f3cf50cf6 (patch) | |
| tree | 15bfa7e4a9c098511c1fc89e2b2c240520b85e2d /config.tests/avx512/avx512.pro | |
| parent | 4bfff6a98b59b32605d881a463ad3edc221a7dc8 (diff) | |
| parent | a96656a8fb6a3c1fc7765659efff28f807fd0deb (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/plugins/platforms/xcb/qxcbconnection.h
src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp
src/plugins/styles/mac/qmacstyle_mac.mm
src/widgets/widgets/qdockarealayout.cpp
src/widgets/widgets/qmainwindow.cpp
src/widgets/widgets/qmainwindowlayout.cpp
src/widgets/widgets/qmainwindowlayout_p.h
tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
tests/auto/other/macnativeevents/BLACKLIST
tests/auto/widgets/widgets/qmenu/BLACKLIST
Change-Id: Ic8e724b80a65e7b1af25511b0e674d209265e567
Diffstat (limited to 'config.tests/avx512/avx512.pro')
| -rw-r--r-- | config.tests/avx512/avx512.pro | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/config.tests/avx512/avx512.pro b/config.tests/avx512/avx512.pro new file mode 100644 index 0000000000..1edf5e5432 --- /dev/null +++ b/config.tests/avx512/avx512.pro @@ -0,0 +1,10 @@ +SOURCES = avx512.cpp + +!defined(AVX512, "var"): error("You must set the AVX512 variable!") + +varname = QMAKE_CFLAGS_AVX512$$AVX512 +value = $$eval($$varname) +!defined($$varname, "var"): error("This compiler does not support AVX512") + +QMAKE_CXXFLAGS += $$value +DEFINES += AVX512WANT=$$AVX512 |