From 83e790dae14725347180bb79e463c5f242616b8d Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Fri, 11 Aug 2017 12:09:06 +0200
Subject: [PATCH] Remove dead code for detecting system SRTP
We currently don't support unbundling SRTP because Chromium uses a too
new unreleased version, but we were still testing for it and claiming to
use the system one if found.
Change-Id: I250f0d7fc1e09398b3196895bdd529d366cd0a86
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
config.tests/srtp/srtp.cpp | 35 ----------------------------------
config.tests/srtp/srtp.pro | 3 ---
mkspecs/features/configure.prf | 5 -----
qtwebengine.pro | 1 -
src/core/config/linux.pri | 1 -
5 files changed, 45 deletions(-)
delete mode 100644 config.tests/srtp/srtp.cpp
delete mode 100644 config.tests/srtp/srtp.pro
diff --git a/config.tests/srtp/srtp.cpp b/config.tests/srtp/srtp.cpp
deleted file mode 100644
index 7dfcc832a..000000000
--- a/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/config.tests/srtp/srtp.pro b/config.tests/srtp/srtp.pro
deleted file mode 100644
index 2151d64aa..000000000
--- a/config.tests/srtp/srtp.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-linux:SOURCES += srtp.cpp
-LIBS += -lsrtp
-CONFIG -= qt
diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf
index f7a38ac12..cf8a9dbb3 100644
--- a/mkspecs/features/configure.prf
+++ b/mkspecs/features/configure.prf
@@ -108,11 +108,6 @@ defineTest(runConfigure) {
log("Compatible system libvpx not found. Using Chromium's copy.$${EOL}")
WEBENGINE_CONFIG += use_bundled_libvpx
}
- config_srtp: WEBENGINE_CONFIG += use_system_libsrtp
- else {
- log("System libsrtp not found. Using Chromium's copy.$${EOL}")
- WEBENGINE_CONFIG += use_bundled_srtp
- }
config_snappy: WEBENGINE_CONFIG += use_system_snappy
else {
log("System snappy not found. Using Chromium's copy.$${EOL}")
diff --git a/qtwebengine.pro b/qtwebengine.pro
index 034e946c4..5c8707b40 100644
--- a/qtwebengine.pro
+++ b/qtwebengine.pro
@@ -25,5 +25,4 @@ OTHER_FILES = \
config.tests/libcap/* \
config.tests/libvpx/* \
config.tests/snappy/* \
- config.tests/srtp/* \
mkspecs/features/*
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
index 60cfa6857..714c864d1 100644
--- a/src/core/config/linux.pri
+++ b/src/core/config/linux.pri
@@ -139,7 +139,6 @@ host_build {
use?(system_libevent): gn_args += use_system_libevent=true
use?(system_libwebp): gn_args += use_system_libwebp=true
- #use?(system_libsrtp): gn_args += use_system_libsrtp=true
use?(system_libxslt): gn_args += use_system_libxml=true use_system_libxslt=true
#use?(system_jsoncpp): gn_args += use_system_jsoncpp=true
use?(system_opus): gn_args += use_system_opus=true
--
GitLab