diff options
author | Liang Qi <liang.qi@qt.io> | 2016-08-16 07:25:49 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-08-16 07:25:49 +0200 |
commit | 6e4d1a0cf21ee18d6584042cd9bea3a7d1d24a56 (patch) | |
tree | 57afb359e42aa922c4ca31666aab1ee7d49c9212 /tools/qmake/config.tests | |
parent | 765f9c6630afcd9d022e30ffdbe909fbf1ea9549 (diff) | |
parent | b7fde78d7822ed7f2221acfd9db15b3ff579e29d (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/3rdparty
src/webengine/api/qquickwebenginecertificateerror.cpp
src/webengine/doc/src/webengineview.qdoc
tools/qmake/config.tests/libcap/libcap.cpp
Change-Id: I2a2cfc904a8d6b561fb71ef7a0cc4bfb860124db
Diffstat (limited to 'tools/qmake/config.tests')
-rw-r--r-- | tools/qmake/config.tests/libcap/libcap.cpp | 36 | ||||
-rw-r--r-- | tools/qmake/config.tests/libcap/libcap.pro | 3 |
2 files changed, 0 insertions, 39 deletions
diff --git a/tools/qmake/config.tests/libcap/libcap.cpp b/tools/qmake/config.tests/libcap/libcap.cpp deleted file mode 100644 index 59313970a..000000000 --- a/tools/qmake/config.tests/libcap/libcap.cpp +++ /dev/null @@ -1,36 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWebEngine module 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/capability.h> - -int main(int, char **) -{ - cap_t cap = cap_get_proc(); - const char *text = cap_to_text(cap, 0); - return 0; -} diff --git a/tools/qmake/config.tests/libcap/libcap.pro b/tools/qmake/config.tests/libcap/libcap.pro deleted file mode 100644 index 2c688f809..000000000 --- a/tools/qmake/config.tests/libcap/libcap.pro +++ /dev/null @@ -1,3 +0,0 @@ -linux: SOURCES += libcap.cpp -LIBS += -lcap -CONFIG -= qt |