diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-11-19 00:20:12 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-11-19 00:20:12 (GMT) |
| commit | fb6a6063ef17d188494d1832e7bd669f0391b55d (patch) | |
| tree | c023b6f13b1625e9095b31a5765e68a205fe9c11 /src/declarative | |
| parent | dbd27a3703905a2b48294b63a79b3a92456076b3 (diff) | |
| parent | 0b991014c55d02211eee01cad44b4ca4a2edb07d (diff) | |
| download | Qt-fb6a6063ef17d188494d1832e7bd669f0391b55d.zip Qt-fb6a6063ef17d188494d1832e7bd669f0391b55d.tar.gz Qt-fb6a6063ef17d188494d1832e7bd669f0391b55d.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/declarative.pro | 6 | ||||
| -rw-r--r-- | src/declarative/graphicsitems/qmlgraphicsborderimage.cpp | 4 | ||||
| -rw-r--r-- | src/declarative/graphicsitems/qmlgraphicsloader.cpp | 2 | ||||
| -rw-r--r-- | src/declarative/qml/qmlcomponent.cpp | 9 |
4 files changed, 16 insertions, 5 deletions
diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro index da8434f..d1e2ee8 100644 --- a/src/declarative/declarative.pro +++ b/src/declarative/declarative.pro @@ -9,8 +9,10 @@ solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2 unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtXml -# QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage -fno-elide-constructors -# LIBS += -lgcov +exists("qml_enable_gcov") { + QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage -fno-elide-constructors + LIBS += -lgcov +} INCLUDEPATH += ../../include/QtDeclarative diff --git a/src/declarative/graphicsitems/qmlgraphicsborderimage.cpp b/src/declarative/graphicsitems/qmlgraphicsborderimage.cpp index e1039f4..d7627ac 100644 --- a/src/declarative/graphicsitems/qmlgraphicsborderimage.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsborderimage.cpp @@ -212,6 +212,8 @@ void QmlGraphicsBorderImage::setSource(const QUrl &url) setImplicitWidth(d->pix.width()); setImplicitHeight(d->pix.height()); + if (d->pix.isNull()) + d->status = Error; if (d->status == Loading) d->status = Ready; d->progress = 1.0; @@ -329,6 +331,8 @@ void QmlGraphicsBorderImage::setGridScaledImage(const QmlGraphicsGridScaledImage setImplicitWidth(d->pix.width()); setImplicitHeight(d->pix.height()); + if (d->pix.isNull()) + d->status = Error; if (d->status == Loading) d->status = Ready; d->progress = 1.0; diff --git a/src/declarative/graphicsitems/qmlgraphicsloader.cpp b/src/declarative/graphicsitems/qmlgraphicsloader.cpp index c466c44..c841efe 100644 --- a/src/declarative/graphicsitems/qmlgraphicsloader.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsloader.cpp @@ -116,6 +116,8 @@ QML_DEFINE_TYPE(Qt,4,6,Loader,QmlGraphicsLoader) \endcode unloads "Page1.qml" and frees resources consumed by it. + + \sa {dynamic-object-creation}{Dynamic Object Creation} */ /*! diff --git a/src/declarative/qml/qmlcomponent.cpp b/src/declarative/qml/qmlcomponent.cpp index e31a1b5..7f8836a 100644 --- a/src/declarative/qml/qmlcomponent.cpp +++ b/src/declarative/qml/qmlcomponent.cpp @@ -219,7 +219,8 @@ QmlComponent::~QmlComponent() } /*! - Returns the component's current \l{QmlComponent::Status} {status}. + \property QmlComponent::status + The component's current \l{QmlComponent::Status} {status}. */ QmlComponent::Status QmlComponent::status() const { @@ -284,7 +285,8 @@ bool QmlComponent::isLoading() const } /*! - Returns he progress of loading the component, from 0.0 (nothing loaded) + \property QmlComponent::progress + The progress of loading the component, from 0.0 (nothing loaded) to 1.0 (finished). */ qreal QmlComponent::progress() const @@ -503,7 +505,8 @@ QString QmlComponent::errorsString() const } /*! - Return the component URL. This is the URL passed to either the constructor, + \property QmlComponent::url + The component URL. This is the URL passed to either the constructor, or the loadUrl() or setData() methods. */ QUrl QmlComponent::url() const |