From 8fb1dbef9c6606b49371f4c7baa8a21419146990 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
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 <kai.koehne@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 tools/qmake/config.tests/libvpx/libvpx.cpp | 35 ------------------------------
 tools/qmake/config.tests/libvpx/libvpx.pro |  3 ---
 2 files changed, 38 deletions(-)
 delete mode 100644 tools/qmake/config.tests/libvpx/libvpx.cpp
 delete mode 100644 tools/qmake/config.tests/libvpx/libvpx.pro

(limited to 'tools/qmake/config.tests/libvpx')

diff --git a/tools/qmake/config.tests/libvpx/libvpx.cpp b/tools/qmake/config.tests/libvpx/libvpx.cpp
deleted file mode 100644
index 258790309..000000000
--- a/tools/qmake/config.tests/libvpx/libvpx.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 <vpx/svc_context.h>
-#include <vpx/vpx_frame_buffer.h>
-
-int main(int, char **)
-{
-    return 0;
-}
diff --git a/tools/qmake/config.tests/libvpx/libvpx.pro b/tools/qmake/config.tests/libvpx/libvpx.pro
deleted file mode 100644
index aff6d1857..000000000
--- a/tools/qmake/config.tests/libvpx/libvpx.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES += libvpx.cpp
-PKGCONFIG += libvpx
-CONFIG -= qt
-- 
cgit v1.2.3