Merge branch 'master' of codereview.qt-project.org:qt/qtbase

tests/auto/tools/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
09 Nokia Corporation and/or its subsidiary(-ies).
09 Nokia Corporation and/or its subsidiary(-ies).
09 Nokia Corporation and/or its subsidiary(-ies).
**
09 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
09 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Nokia Corporation (qt-info@nokia.com)
09 Nokia Corporation and/or its subsidiary(-ies).
**
09 Nokia Corporation and/or its subsidiary(-ies).
** This file is part of the test suite of the Qt Toolkit.
09 Nokia Corporation and/or its subsidiary(-ies).
** $QT_BEGIN_LICENSE:LGPL$
09 Nokia Corporation and/or its subsidiary(-ies).
** No Commercial Usage
09 Nokia Corporation and/or its subsidiary(-ies).
** This file contains pre-release code and may not be distributed.
**
09 Nokia Corporation and/or its subsidiary(-ies).
** You may use this file in accordance with the terms and conditions
** 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.
**
**
** All rights reserved.
**

**
**
**
**
**
** $QT_END_LICENSE$
**
****************************************************************************/

#include <QObject>

class Os9Newlines : public QObject
{
    Q_OBJECT
public Q_SLOTS:
    inline void testSlot() {}
};
+/****************************************************************************
**
** 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 test suite 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
** All rights reserved.
** No Commercial Usage
** All rights reserved.
** This file contains pre-release code and may not be distributed.
** All rights reserved.
** You may use this file in accordance with the terms and conditions
** Contact: Nokia Corporation (qt-info@nokia.com)
** Contact: Nokia Corporation (qt-info@nokia.com)
09 Nokia Corporation and/or its subsidiary(-ies).
**
09 Nokia Corporation and/or its subsidiary(-ies).
** You may use this file in accordance with the terms and conditions
** Contact: Nokia Corporation (qt-info@nokia.com)
** All rights reserved.
** All rights reserved.
09 Nokia Corporation and/or its subsidiary(-ies).
**
** Contact: Nokia Corporation (qt-info@nokia.com)
** Contact: Nokia Corporation (qt-info@nokia.com)
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** Contact: Nokia Corporation (qt-info@nokia.com)
** This file is part of the test suite of the Qt Toolkit.
** Contact: Nokia Corporation (qt-info@nokia.com)
** $QT_BEGIN_LICENSE:LGPL$
** Contact: Nokia Corporation (qt-info@nokia.com)
** No Commercial Usage
** Contact: Nokia Corporation (qt-info@nokia.com)
** This file contains pre-release code and may not be distributed.
** Contact: Nokia Corporation (qt-info@nokia.com)
** You may use this file in accordance with the terms and conditions
**
**
**
09 Nokia Corporation and/or its subsidiary(-ies).
**
** All rights reserved.

**
**
**
**
**
** $QT_END_LICENSE$
**
****************************************************************************/

#include <QObject>

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