From 90a5492fb01ec3bc10c18c5a0acd38d6ed845a6d Mon Sep 17 00:00:00 2001 From: Markus Goetz Date: Mon, 4 Jul 2011 13:34:21 +0200 Subject: Remove config.tests/unix/ipv6 Change-Id: I3b5a05cc70ee205f44b2ee1e7b49e57f8d8fdbcb Reviewed-on: http://codereview.qt.nokia.com/1064 Reviewed-by: Qt Sanity Bot Reviewed-by: Martin Petersson --- config.tests/unix/ipv6/ipv6.pro | 3 -- config.tests/unix/ipv6/ipv6test.cpp | 69 ------------------------------------- 2 files changed, 72 deletions(-) delete mode 100644 config.tests/unix/ipv6/ipv6.pro delete mode 100644 config.tests/unix/ipv6/ipv6test.cpp (limited to 'config.tests') diff --git a/config.tests/unix/ipv6/ipv6.pro b/config.tests/unix/ipv6/ipv6.pro deleted file mode 100644 index c51e61bc8b..0000000000 --- a/config.tests/unix/ipv6/ipv6.pro +++ /dev/null @@ -1,3 +0,0 @@ -SOURCES = ipv6test.cpp -CONFIG -= qt dylib -mac:CONFIG -= app_bundle diff --git a/config.tests/unix/ipv6/ipv6test.cpp b/config.tests/unix/ipv6/ipv6test.cpp deleted file mode 100644 index 26403d8bde..0000000000 --- a/config.tests/unix/ipv6/ipv6test.cpp +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** 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$ -** -****************************************************************************/ - -/* Sample program for configure to test IPv6 support on target -platforms. We check for the required IPv6 data structures. */ - -#if defined(__hpux) -#define _HPUX_SOURCE -#endif - -#ifdef __MINGW32__ -#include -#include -#else -#include -#include -#include -#endif - -int main() -{ - sockaddr_in6 tmp; - sockaddr_storage tmp2; - (void)tmp.sin6_addr.s6_addr; - (void)tmp.sin6_port; - (void)tmp.sin6_family; - (void)tmp.sin6_scope_id; - (void)tmp2; - - return 0; -} -- cgit v1.2.3 From 45dc5852d54bee40281095587653f0b2bd6d7e40 Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Tue, 5 Jul 2011 11:02:44 +1000 Subject: Fixed opengldesktop configure test for mac. This configure test has never worked for mac. In a non-qpa configuration, this didn't matter, as the configure script would skip this configure test on mac. The configure script could also be modified to skip the configure test in the qpa case, but it seems cleaner to make the test actually work. Change-Id: I0402c490fc4c2401f6363ba2215b261f74ee5d75 Reviewed-on: http://codereview.qt.nokia.com/1127 Reviewed-by: Qt Sanity Bot Reviewed-by: Jonas Rabbe --- config.tests/unix/opengldesktop/opengldesktop.cpp | 6 +++++- config.tests/unix/opengldesktop/opengldesktop.pro | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'config.tests') diff --git a/config.tests/unix/opengldesktop/opengldesktop.cpp b/config.tests/unix/opengldesktop/opengldesktop.cpp index 54860fe90b..af21cfdfda 100644 --- a/config.tests/unix/opengldesktop/opengldesktop.cpp +++ b/config.tests/unix/opengldesktop/opengldesktop.cpp @@ -39,7 +39,11 @@ ** ****************************************************************************/ -#include +#if defined(Q_OS_MAC) +# include +#else +# include +#endif int main(int, char **) { diff --git a/config.tests/unix/opengldesktop/opengldesktop.pro b/config.tests/unix/opengldesktop/opengldesktop.pro index ac70ca34ef..fbf36a0c67 100644 --- a/config.tests/unix/opengldesktop/opengldesktop.pro +++ b/config.tests/unix/opengldesktop/opengldesktop.pro @@ -7,3 +7,6 @@ for(p, QMAKE_LIBDIR_OPENGL) { CONFIG -= qt LIBS += $$QMAKE_LIBS_OPENGL + +mac:DEFINES += Q_OS_MAC +CONFIG -= app_bundle -- cgit v1.2.3