diff options
| author | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-07-01 09:25:57 (GMT) |
|---|---|---|
| committer | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-07-01 09:25:57 (GMT) |
| commit | 574fdf0b7e61c1c9994739035d9adb51af2629d0 (patch) | |
| tree | 6cf91585a63b26dce56f18a1ccd924cf7ec38cb9 /tests/auto/qsqldriver/tst_qsqldriver.cpp | |
| parent | a1d5b33bd33ecf1d809346a39d2386cafaf50cef (diff) | |
| parent | 9cb231d773db6deb8fb145eb40aa949a2758d002 (diff) | |
| download | Qt-574fdf0b7e61c1c9994739035d9adb51af2629d0.zip Qt-574fdf0b7e61c1c9994739035d9adb51af2629d0.tar.gz Qt-574fdf0b7e61c1c9994739035d9adb51af2629d0.tar.bz2 | |
Merge commit 'qt/master' into graphicssceneindex
Conflicts:
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/graphicsview/qgraphicsscene_p.h
src/gui/graphicsview/qgraphicsview.cpp
src/gui/graphicsview/qgraphicsview_p.h
Diffstat (limited to 'tests/auto/qsqldriver/tst_qsqldriver.cpp')
| -rw-r--r-- | tests/auto/qsqldriver/tst_qsqldriver.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qsqldriver/tst_qsqldriver.cpp b/tests/auto/qsqldriver/tst_qsqldriver.cpp index d8f7747..6d428df 100644 --- a/tests/auto/qsqldriver/tst_qsqldriver.cpp +++ b/tests/auto/qsqldriver/tst_qsqldriver.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the test suite of the Qt Toolkit. ** @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at qt-sales@nokia.com. +** contact the sales department at http://www.qtsoftware.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ |