From 0b466c2053fefd2e8da56c41d30161b02ed6e77c Mon Sep 17 00:00:00 2001
From: Olivier Goffart <ogoffart@trolltech.com>
Date: Tue, 8 Sep 2009 15:00:25 +0200
Subject: Fix moc test after licence change.

os9-newlines.h must not contains any linebreak
---
 tests/auto/moc/os9-newlines.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/auto/moc/os9-newlines.h b/tests/auto/moc/os9-newlines.h
index f8d37bb..335724d 100644
--- a/tests/auto/moc/os9-newlines.h
+++ b/tests/auto/moc/os9-newlines.h
@@ -1 +1 @@
-/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** No Commercial Usage
** This file contains pre-release code and may not be distributed.
** You may use this file in accordance with the terms and conditions
** contained in the Technology Preview License Agreement accompanying
** this package.
**
** GNU Lesser General Public License Usage
** Alternatively, 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.
**
** If you have questions regarding the use of this file, please contact
** Nokia at qt-info@nokia.com.
**
**
**
**
**
**
**
**
** $QT_END_LICENSE$
**
****************************************************************************/

#include <QObject>

class Os9Newlines : public QObject
{
    Q_OBJECT
public Q_SLOTS:
    inline void testSlot() {}
};

+/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** No Commercial Usage
** This file contains pre-release code and may not be distributed.
** You may use this file in accordance with the terms and conditions
** contained in the Technology Preview License Agreement accompanying
** this package.
**
** GNU Lesser General Public License Usage
** Alternatively, 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.
**
** If you have questions regarding the use of this file, please contact
** Nokia at qt-info@nokia.com.
**
**
**
**
**
**
**
**
** $QT_END_LICENSE$
**
****************************************************************************/

#include <QObject>

class Os9Newlines : public QObject
{
    Q_OBJECT
public Q_SLOTS:
    inline void testSlot() {}
};
\ No newline at end of file
-- 
cgit v0.12


From b3d8d30b254b23f15089dc0caf9a41a24bad817e Mon Sep 17 00:00:00 2001
From: Markus Goetz <Markus.Goetz@nokia.com>
Date: Tue, 8 Sep 2009 15:52:20 +0200
Subject: network-settings.h: Check for DNS setup only when needed

---
 tests/auto/network-settings.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/auto/network-settings.h b/tests/auto/network-settings.h
index da96599..8a8c6f6 100644
--- a/tests/auto/network-settings.h
+++ b/tests/auto/network-settings.h
@@ -74,6 +74,7 @@ public:
 
 };
 
+#ifdef QT_NETWORK_LIB
 class QtNetworkSettingsInitializerCode {
 public:
     QtNetworkSettingsInitializerCode() {
@@ -87,3 +88,4 @@ public:
     }
 };
 QtNetworkSettingsInitializerCode qtNetworkSettingsInitializer;
+#endif
-- 
cgit v0.12