diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-08 12:46:20 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-08 12:46:20 (GMT) |
| commit | 3d852b4b4b6834688519e8a992ecaef391f8bde9 (patch) | |
| tree | ca21946e6461dba53b43fa3b761e9d782b1dc975 /doc/src/snippets/qabstractsliderisnippet.cpp | |
| parent | b54d20070f6a483e0d6e4a06317de7cd8c817806 (diff) | |
| parent | 4e5c366afd6d6f8ccb3fc44cd2f6c522a3192b2d (diff) | |
| download | Qt-3d852b4b4b6834688519e8a992ecaef391f8bde9.zip Qt-3d852b4b4b6834688519e8a992ecaef391f8bde9.tar.gz Qt-3d852b4b4b6834688519e8a992ecaef391f8bde9.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Doc: Fixed warnings and other problems found while fixing markup.
Doc: Adding documentation on configure options for Qt configure
Ensured that trailing newlines are quoted and correct atoms are used.
Fixed build breakage.
Fixed C++ and plain markup found in \c commands.
Doc: Document display-orientation-related widget attributes.
Added a configuration variable for the QML documentation file prefix.
Doc: Renamed a tutorial image to avoid a clash with another image.
Diffstat (limited to 'doc/src/snippets/qabstractsliderisnippet.cpp')
| -rw-r--r-- | doc/src/snippets/qabstractsliderisnippet.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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; |