summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-11-08 13:23:40 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-11-08 13:23:40 (GMT)
commit198d903fa18d9f1d51615974d71de8236e97c2cd (patch)
tree5e30b5b3c5c218d5ca1c3c91c5702ce326a7089b /src
parent22c01928872db30bd47c740abd714989ac910b95 (diff)
parent146f97525ca49822bb684e1e4d9e62ff5484da36 (diff)
downloadQt-198d903fa18d9f1d51615974d71de8236e97c2cd.zip
Qt-198d903fa18d9f1d51615974d71de8236e97c2cd.tar.gz
Qt-198d903fa18d9f1d51615974d71de8236e97c2cd.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/doc-staging: Doc: Updated the configuration file to use the Qt 4.7 style sheets. Doc: Added more hints for building Qt for Symbian on Linux. Doc: reintroducing QML elements table temporarily Doc: adding html clasnames to the next and previous links qdoc: Remove leading QML: text from certain node names. Doc: Attempt to document content handling in Flickable. Doc: Removed note about some Qt classes working without an application.
Diffstat (limited to 'src')
-rw-r--r--src/corelib/kernel/qcoreapplication.cpp9
-rw-r--r--src/declarative/graphicsitems/qdeclarativeflickable.cpp21
2 files changed, 14 insertions, 16 deletions
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index d3f399b..5598187 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -406,11 +406,10 @@ QString qAppName()
operations can call processEvents() to keep the application
responsive.
- Some Qt classes, such as QString, can be used without a
- QCoreApplication object. However, in general, we recommend that
- you create a QCoreApplication or a QApplication object in your \c
- main() function as early as possible. exit() will not return
- until the event loop exits; e.g., when quit() is called.
+ In general, we recommend that you create a QCoreApplication or
+ a QApplication object in your \c main() function as early as
+ possible. exit() will not return until the event loop exits;
+ e.g., when quit() is called.
Several static convenience functions are also provided. The
QCoreApplication object is available from instance(). Events can
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
index b737785..a88fc2b 100644
--- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
@@ -1182,19 +1182,18 @@ void QDeclarativeFlickable::setBoundsBehavior(BoundsBehavior b)
\qmlproperty real Flickable::contentWidth
\qmlproperty real Flickable::contentHeight
- The dimensions of the content (the surface controlled by Flickable). Typically this
- should be set to the combined size of the items placed in the Flickable. Note this
- can be set automatically using \l {Item::childrenRect.width}{childrenRect.width}
- and \l {Item::childrenRect.height}{childrenRect.height}. For example:
+ The dimensions of the content (the surface controlled by Flickable).
+ This should typically be set to the combined size of the items placed in the
+ Flickable.
- \code
- Flickable {
- width: 320; height: 480
- contentWidth: childrenRect.width; contentHeight: childrenRect.height
+ The following snippet shows how these properties are used to display
+ an image that is larger than the Flickable item itself:
- Image { id: image; source: "bigImage.png" }
- }
- \endcode
+ \snippet doc/src/snippets/declarative/flickable.qml document
+
+ In some cases, the the content dimensions can be automatically set
+ using the \l {Item::childrenRect.width}{childrenRect.width}
+ and \l {Item::childrenRect.height}{childrenRect.height} properties.
*/
qreal QDeclarativeFlickable::contentWidth() const
{