From ea0d58c1312d911abd50251c0103ebdcb3db0d4a Mon Sep 17 00:00:00 2001 From: Girish Ramakrishnan Date: Mon, 2 Jul 2012 09:24:16 +0530 Subject: Move DirectFB tests into qpa MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I15c90e2e8befef5529b35fa02d3ca6d67a409cc7 Reviewed-by: Samuel Rødal --- config.tests/qpa/directfb/directfb.cpp | 51 +++++++++++++++++++++++++++++++++ config.tests/qpa/directfb/directfb.pro | 3 ++ config.tests/unix/directfb/directfb.cpp | 51 --------------------------------- config.tests/unix/directfb/directfb.pro | 3 -- configure | 2 +- 5 files changed, 55 insertions(+), 55 deletions(-) create mode 100644 config.tests/qpa/directfb/directfb.cpp create mode 100644 config.tests/qpa/directfb/directfb.pro delete mode 100644 config.tests/unix/directfb/directfb.cpp delete mode 100644 config.tests/unix/directfb/directfb.pro diff --git a/config.tests/qpa/directfb/directfb.cpp b/config.tests/qpa/directfb/directfb.cpp new file mode 100644 index 0000000000..a5a0bd4760 --- /dev/null +++ b/config.tests/qpa/directfb/directfb.cpp @@ -0,0 +1,51 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Intel Corporation +** 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 + +#ifdef __typeof__ +#error DirectFB headers are unclean and cannot compile +#endif + +int main(int, char **) +{ + return 0; +} diff --git a/config.tests/qpa/directfb/directfb.pro b/config.tests/qpa/directfb/directfb.pro new file mode 100644 index 0000000000..958ced7bea --- /dev/null +++ b/config.tests/qpa/directfb/directfb.pro @@ -0,0 +1,3 @@ +SOURCES = directfb.cpp +CONFIG -= qt +mac:CONFIG -= app_bundle diff --git a/config.tests/unix/directfb/directfb.cpp b/config.tests/unix/directfb/directfb.cpp deleted file mode 100644 index a5a0bd4760..0000000000 --- a/config.tests/unix/directfb/directfb.cpp +++ /dev/null @@ -1,51 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Intel Corporation -** 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 - -#ifdef __typeof__ -#error DirectFB headers are unclean and cannot compile -#endif - -int main(int, char **) -{ - return 0; -} diff --git a/config.tests/unix/directfb/directfb.pro b/config.tests/unix/directfb/directfb.pro deleted file mode 100644 index 958ced7bea..0000000000 --- a/config.tests/unix/directfb/directfb.pro +++ /dev/null @@ -1,3 +0,0 @@ -SOURCES = directfb.cpp -CONFIG -= qt -mac:CONFIG -= app_bundle diff --git a/configure b/configure index 097bd90c90..2f590ba1d0 100755 --- a/configure +++ b/configure @@ -4692,7 +4692,7 @@ if [ "$CFG_DIRECTFB" != "no" ]; then if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists directfb 2>/dev/null; then QMAKE_CFLAGS_DIRECTFB=`$PKG_CONFIG --cflags directfb 2>/dev/null` QMAKE_LIBS_DIRECTFB=`$PKG_CONFIG --libs directfb 2>/dev/null` - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" "config.tests/unix/directfb" "DirectFB" $L_FLAGS $I_FLAGS $D_FLAGS $l_FLAGS $QMAKE_CFLAGS_DIRECTFB $QMAKE_LIBS_DIRECTFB; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" "config.tests/qpa/directfb" "DirectFB" $L_FLAGS $I_FLAGS $D_FLAGS $l_FLAGS $QMAKE_CFLAGS_DIRECTFB $QMAKE_LIBS_DIRECTFB; then CFG_DIRECTFB=yes elif [ "$CFG_DIRECTFB" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then echo " DirectFB support cannot be enabled due to functionality tests!" -- cgit v1.2.3