diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-19 11:12:10 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-05-02 13:57:05 +0000 |
commit | 8fb1dbef9c6606b49371f4c7baa8a21419146990 (patch) | |
tree | a925e98214dca11851cefda221ce7f176778e208 /tools/qmake/config.tests/srtp | |
parent | b53896d1e7f3cad971edd56f303a32058cefde48 (diff) |
Move qmake files to standard locations
The tools/qmake directory is a left over from webkit where qmake was
but one of many buildsystems. This is not necessary for qtwebengine, so
we can instead use the standard locations.
Change-Id: I3d126d6627295b113b091f3eabeee25f1c1f6183
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'tools/qmake/config.tests/srtp')
-rw-r--r-- | tools/qmake/config.tests/srtp/srtp.cpp | 35 | ||||
-rw-r--r-- | tools/qmake/config.tests/srtp/srtp.pro | 3 |
2 files changed, 0 insertions, 38 deletions
diff --git a/tools/qmake/config.tests/srtp/srtp.cpp b/tools/qmake/config.tests/srtp/srtp.cpp deleted file mode 100644 index 7dfcc832a..000000000 --- a/tools/qmake/config.tests/srtp/srtp.cpp +++ /dev/null @@ -1,35 +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 <srtp/srtp.h> - -int main(int, char **) -{ - err_status_t status = srtp_init(); - return status == err_status_ok; -} diff --git a/tools/qmake/config.tests/srtp/srtp.pro b/tools/qmake/config.tests/srtp/srtp.pro deleted file mode 100644 index 2151d64aa..000000000 --- a/tools/qmake/config.tests/srtp/srtp.pro +++ /dev/null @@ -1,3 +0,0 @@ -linux:SOURCES += srtp.cpp -LIBS += -lsrtp -CONFIG -= qt |