diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-03 12:13:06 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-03 12:13:06 (GMT) |
| commit | 0b9aa3653cc6c6ea75a79c3c8ff512b53dba13f1 (patch) | |
| tree | 017f3b738d9281b55ceed6366e8f85204fc38b09 /doc/src/snippets/droparea.cpp | |
| parent | 714e0f17aa3d26ddfd9ce6ff8b9f5efbae7a11e5 (diff) | |
| parent | d4a4b01f2f08a9031d692344d0d264de472da25e (diff) | |
| download | Qt-0b9aa3653cc6c6ea75a79c3c8ff512b53dba13f1.zip Qt-0b9aa3653cc6c6ea75a79c3c8ff512b53dba13f1.tar.gz Qt-0b9aa3653cc6c6ea75a79c3c8ff512b53dba13f1.tar.bz2 | |
Merge branch '4.6'
Conflicts:
src/plugins/qpluginbase.pri
tests/benchmarks/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
tools/assistant/compat/mainwindow.cpp
tools/assistant/compat/mainwindow.ui
tools/assistant/tools/assistant/doc/assistant.qdocconf
Diffstat (limited to 'doc/src/snippets/droparea.cpp')
| -rw-r--r-- | doc/src/snippets/droparea.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/src/snippets/droparea.cpp b/doc/src/snippets/droparea.cpp index cc07fcb..34dcc33 100644 --- a/doc/src/snippets/droparea.cpp +++ b/doc/src/snippets/droparea.cpp @@ -3,6 +3,8 @@ ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). ** Contact: Nokia Corporation (qt-info@nokia.com) ** +** This file is part of the documentation of the Qt Toolkit. +** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage ** This file contains pre-release code and may not be distributed. |