From 9b35914190bc06d37f6e337bd01ff5b62b0881be Mon Sep 17 00:00:00 2001 From: Robert Griebl Date: Wed, 26 Apr 2017 01:26:57 +0200 Subject: Get rid of the OpenSSL headers build dependency This also makes it a lot easier to build against newer Android NDKs, where the OpenSSL libs are not available anymore. libcrypto still needs to be deployed, but at least the build-time dependency is removed. Change-Id: I966e2561708aaa7b5ae2f97dc2dc41b179881009 Reviewed-by: Dominik Holland --- config.tests/libcrypto/libcrypto.pro | 11 -------- config.tests/libcrypto/main.cpp | 54 ------------------------------------ 2 files changed, 65 deletions(-) delete mode 100644 config.tests/libcrypto/libcrypto.pro delete mode 100644 config.tests/libcrypto/main.cpp (limited to 'config.tests') diff --git a/config.tests/libcrypto/libcrypto.pro b/config.tests/libcrypto/libcrypto.pro deleted file mode 100644 index b113b4ec..00000000 --- a/config.tests/libcrypto/libcrypto.pro +++ /dev/null @@ -1,11 +0,0 @@ -TARGET = libcrypto -CONFIG -= qt -CONFIG += console - -SOURCES += main.cpp - -linux:packagesExist("'libcrypto >= 1.0.1 libcrypto < 1.1.0'") { - PKGCONFIG_INCLUDEPATH = $$system($$pkgConfigExecutable() --cflags-only-I libcrypto) - PKGCONFIG_INCLUDEPATH ~= s/^-I(.*)/\\1/g - INCLUDEPATH += $$PKGCONFIG_INCLUDEPATH -} diff --git a/config.tests/libcrypto/main.cpp b/config.tests/libcrypto/main.cpp deleted file mode 100644 index 15b43e0d..00000000 --- a/config.tests/libcrypto/main.cpp +++ /dev/null @@ -1,54 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 Pelagicore AG -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Pelagicore Application Manager. -** -** $QT_BEGIN_LICENSE:LGPL-QTAS$ -** Commercial License Usage -** Licensees holding valid commercial Qt Automotive Suite 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 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.LGPL3 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-3.0.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 (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** 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-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -** SPDX-License-Identifier: LGPL-3.0 -** -****************************************************************************/ - -#include - -#if OPENSSL_VERSION_NUMBER-0 < 0x1000100fL -# error "OpenSSL < 1.0.1 is binary incompatible" -#endif -#if OPENSSL_VERSION_NUMBER-0 >= 0x1010000fL -# error "OpenSSL >= 1.1.0 is binary incompatible" -#endif - -int main() -{ - return 0; -} -- cgit v1.2.3