diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-17 00:40:07 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-17 00:40:07 (GMT) |
| commit | 5e38a334b1ef46a932c8aff65a7d448b5c7df853 (patch) | |
| tree | efd294d5c727f432c5d0ffd3e3cbadc7d90f398e /doc/src/demos/styledemo.qdoc | |
| parent | fd5acfc663383c38e4d0993a4163023d46137e32 (diff) | |
| parent | 22aaef6c81897f96e9954b5aaae1816d143b456f (diff) | |
| download | Qt-5e38a334b1ef46a932c8aff65a7d448b5c7df853.zip Qt-5e38a334b1ef46a932c8aff65a7d448b5c7df853.tar.gz Qt-5e38a334b1ef46a932c8aff65a7d448b5c7df853.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Updating file with CRLF line endings for the updated header
Fix a regression in QList::mid()
update gitignore
remove -fno-stack-protector
Fix make confclean
Update licenseheader text in source files
Diffstat (limited to 'doc/src/demos/styledemo.qdoc')
| -rw-r--r-- | doc/src/demos/styledemo.qdoc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/doc/src/demos/styledemo.qdoc b/doc/src/demos/styledemo.qdoc index c4e16d1..415d284 100644 --- a/doc/src/demos/styledemo.qdoc +++ b/doc/src/demos/styledemo.qdoc @@ -7,20 +7,20 @@ ** This file is part of the documentation of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:FDL$ -** 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 Technology Preview License Agreement accompanying -** this package. -** ** GNU Free Documentation License ** Alternatively, this file may be used under the terms of the GNU Free ** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of this -** file. +** Foundation and appearing in the file included in the packaging of +** this file. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms +** and conditions contained in a signed written agreement between you +** and Nokia. +** +** +** ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. ** $QT_END_LICENSE$ ** ****************************************************************************/ |