diff options
author | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:05:33 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-06-07 14:02:43 +0200 |
commit | 7cbee5629604aa49c618829c8e3e55fc64e94df7 (patch) | |
tree | d12041105160c1cb21226b365edb9653d87b5853 /config.tests | |
parent | e400b7e326c554ccd819448866265953d2a0f24d (diff) | |
parent | 5f0ce2333f7e11a3ffb5d16a27cd9303efa712d5 (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/widgets/widgets/qmenu.cpp
Change-Id: I6d3baf56eb24501cddb129a3cb6b958ccc25a308
Diffstat (limited to 'config.tests')
-rw-r--r-- | config.tests/common/c++1z/c++1z.cpp | 2 | ||||
-rw-r--r-- | config.tests/qpa/integrityfb/integrityfb.cpp | 46 | ||||
-rw-r--r-- | config.tests/qpa/integrityfb/integrityfb.pro | 3 | ||||
-rw-r--r-- | config.tests/qpa/integrityhid/integrityhid.cpp | 52 | ||||
-rw-r--r-- | config.tests/qpa/integrityhid/integrityhid.pro | 2 |
5 files changed, 105 insertions, 0 deletions
diff --git a/config.tests/common/c++1z/c++1z.cpp b/config.tests/common/c++1z/c++1z.cpp index a30196f57d..63c6fb5b8a 100644 --- a/config.tests/common/c++1z/c++1z.cpp +++ b/config.tests/common/c++1z/c++1z.cpp @@ -43,4 +43,6 @@ # error "__cplusplus must be > 201402L (the value for C++14)" #endif +#include <map> // https://bugs.llvm.org//show_bug.cgi?id=33117 + int main(int, char **) { return 0; } diff --git a/config.tests/qpa/integrityfb/integrityfb.cpp b/config.tests/qpa/integrityfb/integrityfb.cpp new file mode 100644 index 0000000000..7f2dd0705f --- /dev/null +++ b/config.tests/qpa/integrityfb/integrityfb.cpp @@ -0,0 +1,46 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the config.tests of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** 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 Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** 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-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <device/fbdriver.h> + +int main(int, char **) +{ + FBDriver *driver = 0; + return 0; +} diff --git a/config.tests/qpa/integrityfb/integrityfb.pro b/config.tests/qpa/integrityfb/integrityfb.pro new file mode 100644 index 0000000000..5da4e77923 --- /dev/null +++ b/config.tests/qpa/integrityfb/integrityfb.pro @@ -0,0 +1,3 @@ +SOURCES = integrityfb.cpp + +CONFIG -= qt diff --git a/config.tests/qpa/integrityhid/integrityhid.cpp b/config.tests/qpa/integrityhid/integrityhid.cpp new file mode 100644 index 0000000000..1493e7c7e4 --- /dev/null +++ b/config.tests/qpa/integrityhid/integrityhid.cpp @@ -0,0 +1,52 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the config.tests of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** 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 Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** 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-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <stdlib.h> +#include <stdint.h> +#include <device/hiddriver.h> + +int main(int, char **) +{ + HIDDriver *driver; + uintptr_t devicecontext; + uint32_t device_id; + gh_hid_enum_devices(driver, &device_id, &devicecontext); + + return 0; +} diff --git a/config.tests/qpa/integrityhid/integrityhid.pro b/config.tests/qpa/integrityhid/integrityhid.pro new file mode 100644 index 0000000000..87fafde897 --- /dev/null +++ b/config.tests/qpa/integrityhid/integrityhid.pro @@ -0,0 +1,2 @@ +SOURCES = integrityhid.cpp +CONFIG -= qt |