diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-19 11:12:10 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-05-02 13:57:05 +0000 |
| commit | 8fb1dbef9c6606b49371f4c7baa8a21419146990 (patch) | |
| tree | a925e98214dca11851cefda221ce7f176778e208 /config.tests/khr | |
| parent | b53896d1e7f3cad971edd56f303a32058cefde48 (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 'config.tests/khr')
| -rw-r--r-- | config.tests/khr/khr.cpp | 34 | ||||
| -rw-r--r-- | config.tests/khr/khr.pro | 6 |
2 files changed, 40 insertions, 0 deletions
diff --git a/config.tests/khr/khr.cpp b/config.tests/khr/khr.cpp new file mode 100644 index 000000000..df81bd6b2 --- /dev/null +++ b/config.tests/khr/khr.cpp @@ -0,0 +1,34 @@ +/**************************************************************************** +** +** 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 new file mode 100644 index 000000000..b8e935f5a --- /dev/null +++ b/config.tests/khr/khr.pro @@ -0,0 +1,6 @@ +!isEmpty(QMAKE_INCDIR_EGL): INCLUDEPATH += $$QMAKE_INCDIR_EGL +!isEmpty(QMAKE_INCDIR_OPENGL): INCLUDEPATH += $$QMAKE_INCDIR_OPENGL + +CONFIG-=qt + +linux:SOURCES += khr.cpp |