diff options
author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-22 17:02:40 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-22 17:02:40 +0200 |
commit | 5b909c1fe56f1de48fed1031a030771087d8ab22 (patch) | |
tree | 7fb39c2031baa17f1fdeac5e8f91b43a5a363ef3 /tools/qmake | |
parent | f589b8b411f1049f6f2f701478e0c38c72ad824a (diff) | |
parent | ac41ad48cacac91e428181f7ededb0896ee64c40 (diff) |
Merge dev into 5.8
Change-Id: I23aa7e41dfbbb7c4e4259a32868e64c58c0a1310
Diffstat (limited to 'tools/qmake')
-rw-r--r-- | tools/qmake/config.tests/libcap/libcap.cpp | 36 | ||||
-rw-r--r-- | tools/qmake/config.tests/libcap/libcap.pro | 3 | ||||
-rw-r--r-- | tools/qmake/mkspecs/features/configure.prf | 2 | ||||
-rw-r--r-- | tools/qmake/mkspecs/features/functions.prf | 4 |
4 files changed, 4 insertions, 41 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 diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf index 044fa94aa..9663c1072 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 diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf index ab9593bf9..c8c8e0cc8 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf @@ -50,6 +50,10 @@ defineTest(isPlatformSupported) { skipBuild("C++11 support is required in order to build chromium.") return(false) } + contains(QT_CONFIG, mirclient) { + skipBuild("Mir is not yet supported as graphics backend for Qt WebEngine.") + return(false) + } static { skipBuild("Static builds of QtWebEngine aren't supported.") return(false) |