From 63b6f748f1073599845d57ee4f73aecad8182a33 Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Wed, 7 Aug 2019 15:24:20 +0200
Subject: Move snappy test to configure
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I585e7f9aa19d03ca164e9419e55997526aeaca86
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
---
 config.tests/snappy/snappy.cpp | 36 ------------------------------------
 config.tests/snappy/snappy.pro |  3 ---
 src/core/configure.json        | 20 ++++++++++++++------
 3 files changed, 14 insertions(+), 45 deletions(-)
 delete mode 100644 config.tests/snappy/snappy.cpp
 delete mode 100644 config.tests/snappy/snappy.pro

diff --git a/config.tests/snappy/snappy.cpp b/config.tests/snappy/snappy.cpp
deleted file mode 100644
index d52c73bd0..000000000
--- a/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/config.tests/snappy/snappy.pro b/config.tests/snappy/snappy.pro
deleted file mode 100644
index 890174a13..000000000
--- a/config.tests/snappy/snappy.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-linux:SOURCES += snappy.cpp
-LIBS += -lsnappy
-CONFIG -= qt
diff --git a/src/core/configure.json b/src/core/configure.json
index b4d39696f..0ee556cfb 100644
--- a/src/core/configure.json
+++ b/src/core/configure.json
@@ -250,6 +250,19 @@
                 { "type": "pkgConfig", "args": "freetype2" }
             ]
         },
+        "webengine-snappy": {
+            "label": "snappy",
+            "test": {
+                "main": [
+                     "snappy::Source *src = 0;",
+                     "snappy::Sink *sink = 0;"
+                ]
+            },
+            "headers": "snappy.h",
+            "sources": [
+                "-lsnappy"
+            ]
+        },
         "webengine-x11" : {
             "label" : "x11",
             "sources": [
@@ -274,11 +287,6 @@
             "test": "libvpx",
             "type": "compile"
         },
-        "webengine-snappy": {
-            "label": "snappy",
-            "test": "snappy",
-            "type": "compile"
-        },
         "webengine-winversion": {
             "label": "winversion",
             "test": "winversion",
@@ -510,7 +518,7 @@
         },
         "webengine-system-snappy" : {
             "label": "snappy",
-            "condition": "config.unix && tests.webengine-snappy",
+            "condition": "config.unix && libs.webengine-snappy",
             "output": [ "privateFeature" ]
         },
         "webengine-winversion" : {
-- 
cgit v1.2.3