summaryrefslogtreecommitdiffstats
path: root/config.tests
diff options
context:
space:
mode:
authorRobert Griebl <robert.griebl@qt.io>2021-05-03 16:42:46 +0200
committerRobert Griebl <robert.griebl@qt.io>2021-06-18 13:06:27 +0200
commit26e09279f3cd12324657011c640972e297928f53 (patch)
tree17839d952b17fcc6338105a85604f543dc95547b /config.tests
parent12b4ee7d85b1197cd4b6024e710430a747f76838 (diff)
cmake: Nearly full cmake build
Had to rename a lot of things to conform with the standard Qt module layout that the cmake system expects: - all non-manual tests were moved to a sub-dir named auto/ - the benchmark was moved to tests/ - the 3rdparty folder was moved into src/ Other changes: - libyaml was updated to 2.2.5 while fixing a weird build issue that led to crashes on 64bit systems. - fixed build issues with the new 8.1 MingW compiler. - added support for QT_NO_OPENGL builds. The remaining issues are: - examples still don't build with qmake due to a potential bug in module.pri generation. - tests do run, but the test data is not generated yet dynamically. - qml-only tests are not built and run yet. - qml-only examples are not built yet. Fixes: AUTOSUITE-1632 Change-Id: Ic5fe0148e738b05835c73bed78e624b55861b75e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Dominik Holland <dominik.holland@qt.io>
Diffstat (limited to 'config.tests')
-rw-r--r--config.tests/libarchive/libarchive.pro8
-rw-r--r--config.tests/libarchive/main.cpp40
-rw-r--r--config.tests/libyaml/libyaml.pro8
-rw-r--r--config.tests/libyaml/main.cpp40
-rw-r--r--config.tests/touchemulation/main.cpp39
-rw-r--r--config.tests/touchemulation/touchemulation.pro8
6 files changed, 0 insertions, 143 deletions
diff --git a/config.tests/libarchive/libarchive.pro b/config.tests/libarchive/libarchive.pro
deleted file mode 100644
index 7f4224e0..00000000
--- a/config.tests/libarchive/libarchive.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-TARGET = libarchive
-CONFIG -= qt
-CONFIG += console
-
-SOURCES += main.cpp
-
-PKGCONFIG += "'libarchive >= 3.1.2'"
-CONFIG += link_pkgconfig
diff --git a/config.tests/libarchive/main.cpp b/config.tests/libarchive/main.cpp
deleted file mode 100644
index 2a532461..00000000
--- a/config.tests/libarchive/main.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2021 The Qt Company Ltd.
-** Copyright (C) 2019 Luxoft Sweden AB
-** Copyright (C) 2018 Pelagicore AG
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtApplicationManager module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL$
-** 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 or (at your option) 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.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-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <archive.h>
-#include <archive_entry.h>
-
-int main()
-{
- struct archive *ar = archive_write_new();
-
- return 0;
-}
diff --git a/config.tests/libyaml/libyaml.pro b/config.tests/libyaml/libyaml.pro
deleted file mode 100644
index eaf0665c..00000000
--- a/config.tests/libyaml/libyaml.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-TARGET = libyaml
-CONFIG -= qt
-CONFIG += console
-
-SOURCES += main.cpp
-
-PKGCONFIG += "'yaml-0.1 >= 0.1.6'"
-CONFIG += link_pkgconfig
diff --git a/config.tests/libyaml/main.cpp b/config.tests/libyaml/main.cpp
deleted file mode 100644
index c1f7c70d..00000000
--- a/config.tests/libyaml/main.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2021 The Qt Company Ltd.
-** Copyright (C) 2019 Luxoft Sweden AB
-** Copyright (C) 2018 Pelagicore AG
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtApplicationManager module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL$
-** 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 or (at your option) 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.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-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <yaml.h>
-
-int main()
-{
- yaml_parser_t p;
- yaml_parser_initialize(&p);
-
- return 0;
-}
diff --git a/config.tests/touchemulation/main.cpp b/config.tests/touchemulation/main.cpp
deleted file mode 100644
index 41d73613..00000000
--- a/config.tests/touchemulation/main.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2021 The Qt Company Ltd.
-** Copyright (C) 2019 Luxoft Sweden AB
-** Copyright (C) 2018 Pelagicore AG
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtApplicationManager module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL$
-** 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 or (at your option) 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.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-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <xcb/xcb.h>
-#include <X11/extensions/XInput2.h>
-#include <X11/extensions/XI2proto.h>
-
-int main()
-{
- return 0;
-}
diff --git a/config.tests/touchemulation/touchemulation.pro b/config.tests/touchemulation/touchemulation.pro
deleted file mode 100644
index 6a88ef05..00000000
--- a/config.tests/touchemulation/touchemulation.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-TARGET = touchemulation
-CONFIG -= qt
-CONFIG += console
-
-SOURCES += main.cpp
-
-PKGCONFIG += xcb x11 xi
-CONFIG += link_pkgconfig