summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-08-23 22:30:47 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-08-23 22:30:47 (GMT)
commit2cb91f6371a7918cfe54cc31efe61a39df89ab9e (patch)
tree07214d0935413dc2f48cf10ee9d56e6b96783ba2 /doc
parent6a3945d3ca3185c00597dcaefb93617620973ff5 (diff)
parentd405aa6510514ce02b312994db55c305bde60285 (diff)
downloadQt-2cb91f6371a7918cfe54cc31efe61a39df89ab9e.zip
Qt-2cb91f6371a7918cfe54cc31efe61a39df89ab9e.tar.gz
Qt-2cb91f6371a7918cfe54cc31efe61a39df89ab9e.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'doc')
-rw-r--r--doc/src/objectmodel/properties.qdoc7
-rw-r--r--doc/src/snippets/code/src_corelib_concurrent_qtconcurrentrun.cpp10
2 files changed, 7 insertions, 10 deletions
diff --git a/doc/src/objectmodel/properties.qdoc b/doc/src/objectmodel/properties.qdoc
index dca332e..3a8e3b4 100644
--- a/doc/src/objectmodel/properties.qdoc
+++ b/doc/src/objectmodel/properties.qdoc
@@ -79,10 +79,9 @@
mean \e {reset to the context specific cursor}. The \c RESET
function must return void and take no parameters.
- \o A \c NOTIFY signal is optional. If defined, the signal will be
- emitted whenever the value of the property changes. The signal must
- take one parameter, which must be of the same type as the property; the
- parameter will take the new value of the property.
+ \o A \c NOTIFY signal is optional. If defined, it should specify one
+ existing signal in that class that is emitted whenever the value
+ of the property changes.
\o The \c DESIGNABLE attribute indicates whether the property
should be visible in the property editor of GUI design tool (e.g.,
diff --git a/doc/src/snippets/code/src_corelib_concurrent_qtconcurrentrun.cpp b/doc/src/snippets/code/src_corelib_concurrent_qtconcurrentrun.cpp
index 8f74461..cea6553 100644
--- a/doc/src/snippets/code/src_corelib_concurrent_qtconcurrentrun.cpp
+++ b/doc/src/snippets/code/src_corelib_concurrent_qtconcurrentrun.cpp
@@ -73,16 +73,14 @@ QFuture<QString> future = QtConcurrent::run(someFunction, bytearray);
QString result = future.result();
//! [3]
-
//! [4]
-// call 'QStringList QString::split(const QString &sep, SplitBehavior behavior, Qt::CaseSensitivity cs) const' in a separate thread
-QString string = ...;
-QFuture<QStringList> future = QtConcurrent::run(string, &QString::split, QString(", "), QString::KeepEmptyParts, Qt::CaseSensitive);
+// call 'QList<QByteArray> QByteArray::split(char sep) const' in a separate thread
+QByteArray bytearray = "hello world;
+QFuture<QList<QByteArray> > future = QtConcurrent::run(bytearray, &QByteArray::split), ',');
...
-QStringList result = future.result();
+QList<QByteArray> result = future.result();
//! [4]
-
//! [5]
// call 'void QImage::invertPixels(InvertMode mode)' in a separate thread
QImage image = ...;