diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2009-09-09 04:48:46 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-09-09 04:48:46 (GMT) |
| commit | 1e6a4aab859ab1a41e9bcedb6e8f8f9dc8296d54 (patch) | |
| tree | e2f9bc8a8ca67f1bf0543605bab8ba7348539b1b /tests/auto/selftests/cmptest | |
| parent | 01f48343efd58df74a14e89eb5ead6be5d532c64 (diff) | |
| parent | b2daad6cce4298ba438aba4b0e8bb3ea80680c6e (diff) | |
| download | Qt-1e6a4aab859ab1a41e9bcedb6e8f8f9dc8296d54.zip Qt-1e6a4aab859ab1a41e9bcedb6e8f8f9dc8296d54.tar.gz Qt-1e6a4aab859ab1a41e9bcedb6e8f8f9dc8296d54.tar.bz2 | |
Merge branch '4.6'
Conflicts:
examples/assistant/simpletextviewer/findfiledialog.cpp
examples/assistant/simpletextviewer/findfiledialog.h
examples/assistant/simpletextviewer/main.cpp
examples/assistant/simpletextviewer/mainwindow.cpp
examples/assistant/simpletextviewer/mainwindow.h
tools/assistant/compat/config.cpp
tools/assistant/compat/config.h
tools/assistant/compat/docuparser.cpp
tools/assistant/compat/docuparser.h
tools/assistant/compat/fontsettingsdialog.cpp
tools/assistant/compat/fontsettingsdialog.h
tools/assistant/compat/helpdialog.cpp
tools/assistant/compat/helpdialog.h
tools/assistant/compat/helpdialog.ui
tools/assistant/compat/helpwindow.cpp
tools/assistant/compat/helpwindow.h
tools/assistant/compat/index.cpp
tools/assistant/compat/index.h
tools/assistant/compat/lib/qassistantclient.cpp
tools/assistant/compat/lib/qassistantclient.h
tools/assistant/compat/lib/qassistantclient_global.h
tools/assistant/compat/main.cpp
tools/assistant/compat/mainwindow.cpp
tools/assistant/compat/mainwindow.h
tools/assistant/compat/mainwindow.ui
tools/assistant/compat/profile.cpp
tools/assistant/compat/profile.h
tools/assistant/compat/tabbedbrowser.cpp
tools/assistant/compat/tabbedbrowser.h
tools/assistant/compat/tabbedbrowser.ui
tools/assistant/compat/topicchooser.cpp
tools/assistant/compat/topicchooser.h
tools/assistant/compat/topicchooser.ui
Diffstat (limited to 'tests/auto/selftests/cmptest')
| -rw-r--r-- | tests/auto/selftests/cmptest/tst_cmptest.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/selftests/cmptest/tst_cmptest.cpp b/tests/auto/selftests/cmptest/tst_cmptest.cpp index 99ce034..f0ad4e1 100644 --- a/tests/auto/selftests/cmptest/tst_cmptest.cpp +++ b/tests/auto/selftests/cmptest/tst_cmptest.cpp @@ -1,6 +1,7 @@ /**************************************************************************** ** ** 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. @@ -20,10 +21,9 @@ ** 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. +** 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. |