diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2017-06-06 18:28:37 -0700 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@intel.com> | 2017-06-20 16:37:35 +0000 |
commit | 0669f71b0c78c0d3374571d266004d7503ca8b12 (patch) | |
tree | 9c5ee9a5be7f02c2ca6c52a5987f0c406622694a /config.tests | |
parent | 4de40514066e7e31fe02c87afaf0863d6928391f (diff) | |
download | qtbase-0669f71b0c78c0d3374571d266004d7503ca8b12.tar.gz |
QRandomGenerator: don't internally rely on QT_HAS_INCLUDE
GCC didn't support it until version 5 or 6, so add configure tests for
both <random> and <sys/auxv.h>. Normally I'd say "upgrade", but this is
too low-level and important a feature.
There's a good chance that all our supported compilers have <random>
anyway. As for <sys/auxv.h>, it's present on Glibc, Bionic and MUSL, but
I don't see it in uClibc (AT_RANDOM is a Linux-specific feature).
Change-Id: Ia3e896da908f42939148fffd14c5b2af491f7a77
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'config.tests')
-rw-r--r-- | config.tests/unix/cxx11_random/cxx11_random.cpp | 35 | ||||
-rw-r--r-- | config.tests/unix/cxx11_random/cxx11_random.pro | 1 | ||||
-rw-r--r-- | config.tests/unix/sys_auxv/sys_auxv.cpp | 34 | ||||
-rw-r--r-- | config.tests/unix/sys_auxv/sys_auxv.pro | 1 |
4 files changed, 71 insertions, 0 deletions
diff --git a/config.tests/unix/cxx11_random/cxx11_random.cpp b/config.tests/unix/cxx11_random/cxx11_random.cpp new file mode 100644 index 0000000000..d6872667fd --- /dev/null +++ b/config.tests/unix/cxx11_random/cxx11_random.cpp @@ -0,0 +1,35 @@ +/**************************************************************************** +** +** Copyright (C) 2017 Intel Corporation. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL-EXCEPT$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <random> + +int main() +{ + std::mt19937 mt(0); + return 0; +} diff --git a/config.tests/unix/cxx11_random/cxx11_random.pro b/config.tests/unix/cxx11_random/cxx11_random.pro new file mode 100644 index 0000000000..0cd5fff9d9 --- /dev/null +++ b/config.tests/unix/cxx11_random/cxx11_random.pro @@ -0,0 +1 @@ +SOURCES = cxx11_random.cpp diff --git a/config.tests/unix/sys_auxv/sys_auxv.cpp b/config.tests/unix/sys_auxv/sys_auxv.cpp new file mode 100644 index 0000000000..62f71e95d2 --- /dev/null +++ b/config.tests/unix/sys_auxv/sys_auxv.cpp @@ -0,0 +1,34 @@ +/**************************************************************************** +** +** Copyright (C) 2017 Intel Corporation. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL-EXCEPT$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <sys/auxv.h> + +int main() +{ + return getauxval(AT_NULL); +} diff --git a/config.tests/unix/sys_auxv/sys_auxv.pro b/config.tests/unix/sys_auxv/sys_auxv.pro new file mode 100644 index 0000000000..6920d80e39 --- /dev/null +++ b/config.tests/unix/sys_auxv/sys_auxv.pro @@ -0,0 +1 @@ +SOURCES = sys_auxv.cpp |