From b5b41c18345719612e5411cc482466d2dbafdaf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Lind?= Date: Mon, 12 Mar 2012 12:04:54 +0100 Subject: Remove redundant wayland stuff from QtBase Config checks are done in the module. We pick up the pkg-config stuff also in the module. There shouldn't be a need to do this in configure anyway Change-Id: I9ef73760511c6b684c6cd5dd13e7e581c588e7aa Reviewed-by: Oswald Buddenhagen Reviewed-by: Thiago Macieira --- config.tests/qpa/wayland/wayland.cpp | 46 ------------------------------------ config.tests/qpa/wayland/wayland.pro | 12 ---------- 2 files changed, 58 deletions(-) delete mode 100644 config.tests/qpa/wayland/wayland.cpp delete mode 100644 config.tests/qpa/wayland/wayland.pro (limited to 'config.tests/qpa/wayland') diff --git a/config.tests/qpa/wayland/wayland.cpp b/config.tests/qpa/wayland/wayland.cpp deleted file mode 100644 index c502d22ef3..0000000000 --- a/config.tests/qpa/wayland/wayland.cpp +++ /dev/null @@ -1,46 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the config.tests of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#include - -int main(int, char **) -{ - return 0; -} diff --git a/config.tests/qpa/wayland/wayland.pro b/config.tests/qpa/wayland/wayland.pro deleted file mode 100644 index 6d85073b91..0000000000 --- a/config.tests/qpa/wayland/wayland.pro +++ /dev/null @@ -1,12 +0,0 @@ -SOURCES = wayland.cpp -CONFIG -= qt - -for(d, QMAKE_INCDIR_WAYLAND) { - exists($$d):INCLUDEPATH += $$d -} - -for(p, QMAKE_LIBDIR_WAYLAND) { - exists($$p):LIBS += -L$$p -} - -LIBS += $$QMAKE_LIBS_WAYLAND -- cgit v1.2.3