summaryrefslogtreecommitdiffstats
path: root/tools/qmake/config.tests
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2017-04-19 11:12:10 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2017-05-02 13:57:05 +0000
commit8fb1dbef9c6606b49371f4c7baa8a21419146990 (patch)
treea925e98214dca11851cefda221ce7f176778e208 /tools/qmake/config.tests
parentb53896d1e7f3cad971edd56f303a32058cefde48 (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')
-rw-r--r--tools/qmake/config.tests/alsa/alsa.pro2
-rw-r--r--tools/qmake/config.tests/alsa/alsatest.cpp37
-rw-r--r--tools/qmake/config.tests/khr/khr.cpp34
-rw-r--r--tools/qmake/config.tests/khr/khr.pro6
-rw-r--r--tools/qmake/config.tests/libvpx/libvpx.cpp35
-rw-r--r--tools/qmake/config.tests/libvpx/libvpx.pro3
-rw-r--r--tools/qmake/config.tests/snappy/snappy.cpp36
-rw-r--r--tools/qmake/config.tests/snappy/snappy.pro3
-rw-r--r--tools/qmake/config.tests/srtp/srtp.cpp35
-rw-r--r--tools/qmake/config.tests/srtp/srtp.pro3
-rw-r--r--tools/qmake/config.tests/winversion/winversion.cpp36
-rw-r--r--tools/qmake/config.tests/winversion/winversion.pro3
12 files changed, 0 insertions, 233 deletions
diff --git a/tools/qmake/config.tests/alsa/alsa.pro b/tools/qmake/config.tests/alsa/alsa.pro
deleted file mode 100644
index 7322b6fb8..000000000
--- a/tools/qmake/config.tests/alsa/alsa.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = alsatest.cpp
-
diff --git a/tools/qmake/config.tests/alsa/alsatest.cpp b/tools/qmake/config.tests/alsa/alsatest.cpp
deleted file mode 100644
index ea511cd21..000000000
--- a/tools/qmake/config.tests/alsa/alsatest.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/****************************************************************************
-**
-** 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 <alsa/asoundlib.h>
-#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/tools/qmake/config.tests/khr/khr.cpp b/tools/qmake/config.tests/khr/khr.cpp
deleted file mode 100644
index df81bd6b2..000000000
--- a/tools/qmake/config.tests/khr/khr.cpp
+++ /dev/null
@@ -1,34 +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 <KHR/khrplatform.h>
-
-int main(int, char **)
-{
- return 0;
-}
diff --git a/tools/qmake/config.tests/khr/khr.pro b/tools/qmake/config.tests/khr/khr.pro
deleted file mode 100644
index b8e935f5a..000000000
--- a/tools/qmake/config.tests/khr/khr.pro
+++ /dev/null
@@ -1,6 +0,0 @@
-!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/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
diff --git a/tools/qmake/config.tests/snappy/snappy.cpp b/tools/qmake/config.tests/snappy/snappy.cpp
deleted file mode 100644
index d52c73bd0..000000000
--- a/tools/qmake/config.tests/snappy/snappy.cpp
+++ /dev/null
@@ -1,36 +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 <snappy.h>
-
-int main(int, char **)
-{
- snappy::Source* src = 0;
- snappy::Sink* sink = 0;
- return 0;
-}
diff --git a/tools/qmake/config.tests/snappy/snappy.pro b/tools/qmake/config.tests/snappy/snappy.pro
deleted file mode 100644
index 890174a13..000000000
--- a/tools/qmake/config.tests/snappy/snappy.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-linux:SOURCES += snappy.cpp
-LIBS += -lsnappy
-CONFIG -= qt
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
diff --git a/tools/qmake/config.tests/winversion/winversion.cpp b/tools/qmake/config.tests/winversion/winversion.cpp
deleted file mode 100644
index 3a7b67212..000000000
--- a/tools/qmake/config.tests/winversion/winversion.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/****************************************************************************
-**
-** 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/tools/qmake/config.tests/winversion/winversion.pro b/tools/qmake/config.tests/winversion/winversion.pro
deleted file mode 100644
index dc501a2f6..000000000
--- a/tools/qmake/config.tests/winversion/winversion.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-CONFIG-=qt
-CONFIG+=console
-win32: SOURCES += winversion.cpp