diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-27 04:36:23 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-27 04:36:23 (GMT) |
| commit | 96beb59dc7fb303debbbf06beb192158ab3476c2 (patch) | |
| tree | e79744dfe391d11c011e6d7d396df4f1d9b097d5 | |
| parent | 7285c09ef777569514e73dffa22ecfdb7df6ba8f (diff) | |
| parent | 85d8ead39ea03f55e140ce737839dbb203940b56 (diff) | |
| download | Qt-96beb59dc7fb303debbbf06beb192158ab3476c2.zip Qt-96beb59dc7fb303debbbf06beb192158ab3476c2.tar.gz Qt-96beb59dc7fb303debbbf06beb192158ab3476c2.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix bug in QML debug client installation
Doc clarification for Loader.
| -rw-r--r-- | src/declarative/debugger/qdeclarativedebugclient.cpp | 2 | ||||
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeloader.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/declarative/debugger/qdeclarativedebugclient.cpp b/src/declarative/debugger/qdeclarativedebugclient.cpp index 977e58e..f5c5751 100644 --- a/src/declarative/debugger/qdeclarativedebugclient.cpp +++ b/src/declarative/debugger/qdeclarativedebugclient.cpp @@ -93,7 +93,7 @@ QDeclarativeDebugConnectionPrivate::QDeclarativeDebugConnectionPrivate(QDeclarat void QDeclarativeDebugConnectionPrivate::advertisePlugins() { - if (!q->isConnected() || !gotHello) + if (!q->isConnected()) return; QPacket pack; diff --git a/src/declarative/graphicsitems/qdeclarativeloader.cpp b/src/declarative/graphicsitems/qdeclarativeloader.cpp index 5647b14..7777567 100644 --- a/src/declarative/graphicsitems/qdeclarativeloader.cpp +++ b/src/declarative/graphicsitems/qdeclarativeloader.cpp @@ -216,7 +216,8 @@ QDeclarativeLoader::~QDeclarativeLoader() cannot load non-visual components. To unload the currently loaded item, set this property to an empty string, - or set \l sourceComponent to \c undefined. + or set \l sourceComponent to \c undefined. Setting \c source to a + new URL will also cause the item created by the previous URL to be unloaded. \sa sourceComponent, status, progress */ |