diff options
| author | Alex <qt-info@nokia.com> | 2009-10-26 11:45:08 +1000 |
|---|---|---|
| committer | Alex <qt-info@nokia.com> | 2009-10-26 11:45:08 +1000 |
| commit | 6fec76e457c4cd9d8a34139a1c56d43ea6b20385 (patch) | |
| tree | 7bdf07d70e0e97427369861561ac1292fd813272 /tests/auto/qnetworkconfigmanager/tst_qnetworkconfigmanager.cpp | |
| parent | 75f5440825078138c11eff61cddb8019feaddb60 (diff) | |
| parent | ddd4d6d5a7224748398e927610fcd9176c6ba353 (diff) | |
Merge branch 'master' into maemo
Conflicts:
bearer/bearer.pro
examples/bearercloud/bearercloud.pro
examples/bearermonitor/bearermonitor.pro
tests/tests.pro
Diffstat (limited to 'tests/auto/qnetworkconfigmanager/tst_qnetworkconfigmanager.cpp')
| -rw-r--r-- | tests/auto/qnetworkconfigmanager/tst_qnetworkconfigmanager.cpp | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/tests/auto/qnetworkconfigmanager/tst_qnetworkconfigmanager.cpp b/tests/auto/qnetworkconfigmanager/tst_qnetworkconfigmanager.cpp index 0d0680e180..dc54fffa39 100644 --- a/tests/auto/qnetworkconfigmanager/tst_qnetworkconfigmanager.cpp +++ b/tests/auto/qnetworkconfigmanager/tst_qnetworkconfigmanager.cpp @@ -1,6 +1,7 @@ /**************************************************************************** ** -** Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +** 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 Qt Mobility Components. @@ -20,16 +21,24 @@ ** 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.0, included in the file LGPL_EXCEPTION.txt in this -** package. +** 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. +** +** +** +** +** +** +** ** -** If you have questions regarding the use of this file, please -** contact Nokia at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ + #include <QtTest/QtTest> #include "../qbearertestcommon.h" #include "qnetworkconfiguration.h" |