From 8fb1dbef9c6606b49371f4c7baa8a21419146990 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 19 Apr 2017 11:12:10 +0200 Subject: 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 Reviewed-by: Oswald Buddenhagen --- config.tests/alsa/alsa.pro | 2 ++ config.tests/alsa/alsatest.cpp | 37 ++++++++++++++++++++++++++++++++++ config.tests/khr/khr.cpp | 34 +++++++++++++++++++++++++++++++ config.tests/khr/khr.pro | 6 ++++++ config.tests/libvpx/libvpx.cpp | 35 ++++++++++++++++++++++++++++++++ config.tests/libvpx/libvpx.pro | 3 +++ config.tests/snappy/snappy.cpp | 36 +++++++++++++++++++++++++++++++++ config.tests/snappy/snappy.pro | 3 +++ config.tests/srtp/srtp.cpp | 35 ++++++++++++++++++++++++++++++++ config.tests/srtp/srtp.pro | 3 +++ config.tests/winversion/winversion.cpp | 36 +++++++++++++++++++++++++++++++++ config.tests/winversion/winversion.pro | 3 +++ 12 files changed, 233 insertions(+) create mode 100644 config.tests/alsa/alsa.pro create mode 100644 config.tests/alsa/alsatest.cpp create mode 100644 config.tests/khr/khr.cpp create mode 100644 config.tests/khr/khr.pro create mode 100644 config.tests/libvpx/libvpx.cpp create mode 100644 config.tests/libvpx/libvpx.pro create mode 100644 config.tests/snappy/snappy.cpp create mode 100644 config.tests/snappy/snappy.pro create mode 100644 config.tests/srtp/srtp.cpp create mode 100644 config.tests/srtp/srtp.pro create mode 100644 config.tests/winversion/winversion.cpp create mode 100644 config.tests/winversion/winversion.pro (limited to 'config.tests') diff --git a/config.tests/alsa/alsa.pro b/config.tests/alsa/alsa.pro new file mode 100644 index 000000000..7322b6fb8 --- /dev/null +++ b/config.tests/alsa/alsa.pro @@ -0,0 +1,2 @@ +SOURCES = alsatest.cpp + diff --git a/config.tests/alsa/alsatest.cpp b/config.tests/alsa/alsatest.cpp new file mode 100644 index 000000000..ea511cd21 --- /dev/null +++ b/config.tests/alsa/alsatest.cpp @@ -0,0 +1,37 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the documentation 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 +#if SND_LIB_VERSION < 0x1000a // 1.0.10 +#error "Alsa version found too old, require >= 1.0.10" +#endif + +int main(int argc,char **argv) +{ +} + diff --git a/config.tests/khr/khr.cpp b/config.tests/khr/khr.cpp new file mode 100644 index 000000000..df81bd6b2 --- /dev/null +++ b/config.tests/khr/khr.cpp @@ -0,0 +1,34 @@ +/**************************************************************************** +** +** 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 + +int main(int, char **) +{ + return 0; +} diff --git a/config.tests/khr/khr.pro b/config.tests/khr/khr.pro new file mode 100644 index 000000000..b8e935f5a --- /dev/null +++ b/config.tests/khr/khr.pro @@ -0,0 +1,6 @@ +!isEmpty(QMAKE_INCDIR_EGL): INCLUDEPATH += $$QMAKE_INCDIR_EGL +!isEmpty(QMAKE_INCDIR_OPENGL): INCLUDEPATH += $$QMAKE_INCDIR_OPENGL + +CONFIG-=qt + +linux:SOURCES += khr.cpp diff --git a/config.tests/libvpx/libvpx.cpp b/config.tests/libvpx/libvpx.cpp new file mode 100644 index 000000000..258790309 --- /dev/null +++ b/config.tests/libvpx/libvpx.cpp @@ -0,0 +1,35 @@ +/**************************************************************************** +** +** 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 +#include + +int main(int, char **) +{ + return 0; +} diff --git a/config.tests/libvpx/libvpx.pro b/config.tests/libvpx/libvpx.pro new file mode 100644 index 000000000..aff6d1857 --- /dev/null +++ b/config.tests/libvpx/libvpx.pro @@ -0,0 +1,3 @@ +SOURCES += libvpx.cpp +PKGCONFIG += libvpx +CONFIG -= qt diff --git a/config.tests/snappy/snappy.cpp b/config.tests/snappy/snappy.cpp new file mode 100644 index 000000000..d52c73bd0 --- /dev/null +++ b/config.tests/snappy/snappy.cpp @@ -0,0 +1,36 @@ +/**************************************************************************** +** +** 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 + +int main(int, char **) +{ + snappy::Source* src = 0; + snappy::Sink* sink = 0; + return 0; +} diff --git a/config.tests/snappy/snappy.pro b/config.tests/snappy/snappy.pro new file mode 100644 index 000000000..890174a13 --- /dev/null +++ b/config.tests/snappy/snappy.pro @@ -0,0 +1,3 @@ +linux:SOURCES += snappy.cpp +LIBS += -lsnappy +CONFIG -= qt diff --git a/config.tests/srtp/srtp.cpp b/config.tests/srtp/srtp.cpp new file mode 100644 index 000000000..7dfcc832a --- /dev/null +++ b/config.tests/srtp/srtp.cpp @@ -0,0 +1,35 @@ +/**************************************************************************** +** +** 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 + +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 new file mode 100644 index 000000000..2151d64aa --- /dev/null +++ b/config.tests/srtp/srtp.pro @@ -0,0 +1,3 @@ +linux:SOURCES += srtp.cpp +LIBS += -lsrtp +CONFIG -= qt diff --git a/config.tests/winversion/winversion.cpp b/config.tests/winversion/winversion.cpp new file mode 100644 index 000000000..3a7b67212 --- /dev/null +++ b/config.tests/winversion/winversion.cpp @@ -0,0 +1,36 @@ +/**************************************************************************** +** +** Copyright (C) 2017 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$ +** +****************************************************************************/ + +#if !defined(_MSC_FULL_VER) || _MSC_FULL_VER < 190024213 +#error VS 2015 Update 3 with Cumulative Servicing Release or higher is required +#endif + +int main(int, char **) +{ + return 0; +} diff --git a/config.tests/winversion/winversion.pro b/config.tests/winversion/winversion.pro new file mode 100644 index 000000000..dc501a2f6 --- /dev/null +++ b/config.tests/winversion/winversion.pro @@ -0,0 +1,3 @@ +CONFIG-=qt +CONFIG+=console +win32: SOURCES += winversion.cpp -- cgit v1.2.1