diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-02-19 23:13:24 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-02-19 23:13:24 (GMT) |
| commit | 840dab97ee4bd68dcf75cfd2edd5e58c38040ae1 (patch) | |
| tree | 04270ec3cad3bfb3d2cb48f6c6455b49aee02b53 /src/declarative/graphicsitems/qmlgraphicsloader.cpp | |
| parent | 46e84339a9eaf1587528c20a4c9e05bc1b549afd (diff) | |
| parent | 01498eb9a44f3b15e517e81b309087fbbf1b93bf (diff) | |
| download | Qt-840dab97ee4bd68dcf75cfd2edd5e58c38040ae1.zip Qt-840dab97ee4bd68dcf75cfd2edd5e58c38040ae1.tar.gz Qt-840dab97ee4bd68dcf75cfd2edd5e58c38040ae1.tar.bz2 | |
Merge remote branch 'origin/master' into mobility-master
Conflicts:
src/network/access/qnetworkaccessmanager.cpp
Diffstat (limited to 'src/declarative/graphicsitems/qmlgraphicsloader.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qmlgraphicsloader.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/declarative/graphicsitems/qmlgraphicsloader.cpp b/src/declarative/graphicsitems/qmlgraphicsloader.cpp index b3486ef..159ddc3 100644 --- a/src/declarative/graphicsitems/qmlgraphicsloader.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsloader.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -108,8 +108,6 @@ void QmlGraphicsLoaderPrivate::initResize() _q_updateSize(); } -QML_DEFINE_TYPE(Qt,4,6,Loader,QmlGraphicsLoader) - /*! \qmlclass Loader QmlGraphicsLoader \inherits Item @@ -400,6 +398,7 @@ void QmlGraphicsLoader::setResizeMode(ResizeMode mode) } d->resizeMode = mode; + emit resizeModeChanged(); d->initResize(); } |