diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@qt.io> | 2017-07-13 16:34:32 -0700 |
|---|---|---|
| committer | Gabriel de Dietrich <gabriel.dedietrich@qt.io> | 2017-07-13 16:36:10 -0700 |
| commit | d38fe875c7850ca2c6ca28f91e94ae276735fac8 (patch) | |
| tree | e5c92cef74e0853490d77cf0139b23f00d548a6e /configure.json | |
| parent | ac4e848c9802377b7c4ff673180f28b9ca76b746 (diff) | |
| parent | 627f0a7f7d775ecd263b95dd07fca44bfcb0c5cf (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/widgets/widgets/qmainwindowlayout.cpp
Change-Id: I306b4f5ad11bceb336c9091241b468d455fe6bb6
Diffstat (limited to 'configure.json')
| -rw-r--r-- | configure.json | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/configure.json b/configure.json index 633b5c8411..a46a3380fc 100644 --- a/configure.json +++ b/configure.json @@ -411,11 +411,6 @@ "subarch": "neon" }, - "mremap": { - "label": "mremap()", - "type": "compile", - "test": "unix/mremap" - }, "posix_fallocate": { "label": "POSIX fallocate()", "type": "compile", @@ -942,11 +937,6 @@ { "type": "define", "name": "QT_COMPILER_SUPPORTS_NEON", "value": 1 } ] }, - "mremap": { - "label": "mremap()", - "condition": "tests.mremap", - "output": [ "feature" ] - }, "posix_fallocate": { "label": "POSIX fallocate()", "condition": "tests.posix_fallocate", |