summaryrefslogtreecommitdiffstats
path: root/doc/src/examples/qtconcurrent-progressdialog.qdoc
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-10-14 21:18:16 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-10-14 21:18:16 (GMT)
commit817e6fef7c538a87cfc62b6f02d14b3e5aa39468 (patch)
tree7e48a8c60513a32139d87ce2c14e8667e0c5bdff /doc/src/examples/qtconcurrent-progressdialog.qdoc
parent9358d77fc1de64d2a8a06bfa4095dcde9f9b009b (diff)
parent830df741afc987f12d744bfab8a4b9ee538c212a (diff)
downloadQt-817e6fef7c538a87cfc62b6f02d14b3e5aa39468.zip
Qt-817e6fef7c538a87cfc62b6f02d14b3e5aa39468.tar.gz
Qt-817e6fef7c538a87cfc62b6f02d14b3e5aa39468.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (61 commits) tst_qcompleter: Fix the QTBUG_14292_filesystem test on X11 tst_qcompleter.cpp: fix test on mac. Fixed autotest that was missing focus on Windows QGraphicsLayoutItem - user set sizes should always override, even if there's a constraint QGridLayoutEngine - Rework height-for-width support so that row/col spanning works Revert "Revert "Fix (implement!) hfw/wfh in QGridLayoutEngine"" Fixed statement about const_iterator and some whitespace fixes. Adjust the parent index for the itemsMoved call. Correctly handle both 16bit and 32bit live pixmaps in meego graphics system. Correctly remove the egl alpha surface flags in meego graphics system. Proper dither & proper alpha checking. In meego graphics system, use always 16bit textures. QCompleter: do not auto complete when directory is changed. tst_qcompleter: Add a test for QFileSystemModel Doc: adjusting the search field width Doc - remove disclaimer Added the default format of QTime::toString(). Moved the property documentation to its proper location. Added Q_INVOKABLE to ignore file. Made several QMenuBar functions visible to qdoc and added documentation. ...
Diffstat (limited to 'doc/src/examples/qtconcurrent-progressdialog.qdoc')
-rw-r--r--doc/src/examples/qtconcurrent-progressdialog.qdoc10
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/src/examples/qtconcurrent-progressdialog.qdoc b/doc/src/examples/qtconcurrent-progressdialog.qdoc
index b5e9dde..b5e01ed 100644
--- a/doc/src/examples/qtconcurrent-progressdialog.qdoc
+++ b/doc/src/examples/qtconcurrent-progressdialog.qdoc
@@ -7,11 +7,11 @@
** This file is part of the documentation of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:FDL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in a
-** written agreement between you and Nokia.
+** 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