diff options
| author | Gabriel de Dietrich <gabriel.dietrich-de@nokia.com> | 2011-02-15 13:13:01 (GMT) |
|---|---|---|
| committer | Gabriel de Dietrich <gabriel.dietrich-de@nokia.com> | 2011-02-15 13:13:01 (GMT) |
| commit | 1c5596b514d3a590bd624c9e83606b435e5d4889 (patch) | |
| tree | e2e672c4822fe26bea8b7e4a1424931da23a7639 /doc/src/snippets | |
| parent | 9c8b54fab60835f24cd15b806a7919df804c4615 (diff) | |
| parent | 7033466baf4f78fd580d5dd54a0a4a2e42d71603 (diff) | |
| download | Qt-1c5596b514d3a590bd624c9e83606b435e5d4889.zip Qt-1c5596b514d3a590bd624c9e83606b435e5d4889.tar.gz Qt-1c5596b514d3a590bd624c9e83606b435e5d4889.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7
Diffstat (limited to 'doc/src/snippets')
| -rw-r--r-- | doc/src/snippets/code/src_corelib_concurrent_qtconcurrentrun.cpp | 2 | ||||
| -rw-r--r-- | doc/src/snippets/qabstractsliderisnippet.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/snippets/code/src_corelib_concurrent_qtconcurrentrun.cpp b/doc/src/snippets/code/src_corelib_concurrent_qtconcurrentrun.cpp index 2494eb2..11f5163 100644 --- a/doc/src/snippets/code/src_corelib_concurrent_qtconcurrentrun.cpp +++ b/doc/src/snippets/code/src_corelib_concurrent_qtconcurrentrun.cpp @@ -75,7 +75,7 @@ QString result = future.result(); //! [4] // call 'QList<QByteArray> QByteArray::split(char sep) const' in a separate thread -QByteArray bytearray = "hello world; +QByteArray bytearray = "hello world"; QFuture<QList<QByteArray> > future = QtConcurrent::run(bytearray, &QByteArray::split), ','); ... QList<QByteArray> result = future.result(); diff --git a/doc/src/snippets/qabstractsliderisnippet.cpp b/doc/src/snippets/qabstractsliderisnippet.cpp index 6b684e9..cb0f8cc 100644 --- a/doc/src/snippets/qabstractsliderisnippet.cpp +++ b/doc/src/snippets/qabstractsliderisnippet.cpp @@ -50,7 +50,7 @@ QAbstractSliderPrivate::~QAbstractSliderPrivate() { } -oid QAbstractSlider::setRange(int min, int max) +void QAbstractSlider::setRange(int min, int max) { Q_D(QAbstractSlider); int oldMin = d->minimum; |