From f45e938472f64e9bf2d38a2000e9e93db52016d9 Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Wed, 7 Aug 2019 18:10:21 +0200
Subject: Move khr test to configure

Change-Id: Ic213555705f12a46283c62410bf9a477f03c05c0
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 config.tests/khr/khr.cpp | 34 ----------------------------------
 config.tests/khr/khr.pro |  6 ------
 src/core/configure.json  | 10 ++++++++--
 3 files changed, 8 insertions(+), 42 deletions(-)
 delete mode 100644 config.tests/khr/khr.cpp
 delete mode 100644 config.tests/khr/khr.pro

diff --git a/config.tests/khr/khr.cpp b/config.tests/khr/khr.cpp
deleted file mode 100644
index df81bd6b2..000000000
--- a/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/config.tests/khr/khr.pro b/config.tests/khr/khr.pro
deleted file mode 100644
index b8e935f5a..000000000
--- a/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/src/core/configure.json b/src/core/configure.json
index 3e7968d41..7ec1b0714 100644
--- a/src/core/configure.json
+++ b/src/core/configure.json
@@ -294,8 +294,14 @@
         },
         "webengine-khr": {
             "label": "khr",
-            "test": "khr",
-            "type": "compile"
+            "type": "compile",
+            "test": {
+                "include": "KHR/khrplatform.h",
+                "qmake" : [
+                    "!isEmpty(QMAKE_INCDIR_EGL): INCLUDEPATH += $$QMAKE_INCDIR_EGL",
+                    "!isEmpty(QMAKE_INCDIR_OPENGL): INCLUDEPATH += $$QMAKE_INCDIR_OPENGL"
+                ]
+            }
         },
         "webengine-winversion": {
             "label": "winversion",
-- 
cgit v1.2.3