diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-08-31 23:50:07 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-08-31 23:50:07 (GMT) |
| commit | 205446535fb1436765dd33121dcd15ae917a1800 (patch) | |
| tree | 2e80e9708d4fdfe9b80b0b4ef45432770a76059a /tools/qvfb/main.cpp | |
| parent | b3489278b1c54ee5c15d103d45710195083fbd2b (diff) | |
| parent | 709c4df621f637bc81127e7c1a8bd59d0f2f04e4 (diff) | |
| download | Qt-205446535fb1436765dd33121dcd15ae917a1800.zip Qt-205446535fb1436765dd33121dcd15ae917a1800.tar.gz Qt-205446535fb1436765dd33121dcd15ae917a1800.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
src/gui/graphicsview/qgraphicsitem_p.h
src/gui/graphicsview/qgraphicsscene.cpp
Diffstat (limited to 'tools/qvfb/main.cpp')
| -rw-r--r-- | tools/qvfb/main.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/tools/qvfb/main.cpp b/tools/qvfb/main.cpp index 2e10bdc..603883a 100644 --- a/tools/qvfb/main.cpp +++ b/tools/qvfb/main.cpp @@ -9,8 +9,8 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** 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 @@ -21,20 +21,20 @@ ** 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 +** 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. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ |