From 3879f01f0ce065a1f9a16e5f898aed5111a62adc Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 5 Aug 2016 14:02:53 +0200 Subject: Remove libcap dependency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Chromium does not appear to use it anymore. Change-Id: I846fd869ffb15b832f208764fe8066f000187973 Reviewed-by: Simon Hausmann Reviewed-by: Michael Brüning --- tools/qmake/config.tests/libcap/libcap.cpp | 44 ------------------------------ tools/qmake/config.tests/libcap/libcap.pro | 3 -- tools/qmake/mkspecs/features/configure.prf | 2 -- 3 files changed, 49 deletions(-) delete mode 100644 tools/qmake/config.tests/libcap/libcap.cpp delete mode 100644 tools/qmake/config.tests/libcap/libcap.pro (limited to 'tools') diff --git a/tools/qmake/config.tests/libcap/libcap.cpp b/tools/qmake/config.tests/libcap/libcap.cpp deleted file mode 100644 index 1bea7b078..000000000 --- a/tools/qmake/config.tests/libcap/libcap.cpp +++ /dev/null @@ -1,44 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the QtWebEngine module 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://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.LGPLv3 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.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 later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include - -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 diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf index 8427b58e3..8e936eba4 100644 --- a/tools/qmake/mkspecs/features/configure.prf +++ b/tools/qmake/mkspecs/features/configure.prf @@ -21,8 +21,6 @@ defineTest(runConfigure) { } linux { - # libcap-dev package doesn't ship .pc files on Ubuntu. - !config_libcap:skipBuild("libcap development package appears to be missing") !config_khr:skipBuild("khronos development headers appear to be missing (mesa/libegl1-mesa-dev)") REQUIRED_PACKAGES = dbus-1 fontconfig -- cgit v1.2.3