diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-04-07 10:18:50 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-04-07 10:24:33 +0200 |
| commit | 5d6073be27cb951b692bbcc4dc0dd54cc09c9fd4 (patch) | |
| tree | c87c236cd1b9c15eb5f40df3d86915687ab6c59a /config.tests/common/alloca | |
| parent | 97d7d80e7355019bb23bb03c2a82908e4436deb0 (diff) | |
| parent | bbb67ca32cebad312f02e916dff54e591b92af24 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
mkspecs/linux-icc/qmake.conf
mkspecs/macx-icc/qmake.conf
mkspecs/win32-icc/qmake.conf
src/gui/painting/qgrayraster.c
Change-Id: Ib08c45ea3215be05f986ecb3e1f4b37d209aa775
Diffstat (limited to 'config.tests/common/alloca')
| -rw-r--r-- | config.tests/common/alloca/alloca.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config.tests/common/alloca/alloca.cpp b/config.tests/common/alloca/alloca.cpp index 566ee5651a..d839b381ef 100644 --- a/config.tests/common/alloca/alloca.cpp +++ b/config.tests/common/alloca/alloca.cpp @@ -39,6 +39,9 @@ #include <alloca.h> +// extra include needed in QNX7 to define NULL for the alloca() macro +#include <stdlib.h> + int main(int, char **) { alloca(1); |