diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-17 18:22:47 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-17 18:22:47 (GMT) |
| commit | 379b4dc81177b95c15de30c5925efca1136e4041 (patch) | |
| tree | 44e70fde281072eb4c56d79bf8b92f6e9c4b5a6b /src | |
| parent | 94a3356d5eb7b255d439efe2699bf3a9b025e8eb (diff) | |
| parent | 672c0d15ad07aaffeb7354e9fd8a822ee0d36ac2 (diff) | |
| download | Qt-379b4dc81177b95c15de30c5925efca1136e4041.zip Qt-379b4dc81177b95c15de30c5925efca1136e4041.tar.gz Qt-379b4dc81177b95c15de30c5925efca1136e4041.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix a small typo in assistant manual: hompage -> homepage
Print icon in doc pages has no effect.
Assistant has unnecessary repaints when expand/collapse selected node.
Compile fixes.
Changelog: Added Designer/uic3 changes for 4.7.0.
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/qml/qdeclarativeengine_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/declarative/qml/qdeclarativeengine_p.h b/src/declarative/qml/qdeclarativeengine_p.h index 531ac97..0b1c17d 100644 --- a/src/declarative/qml/qdeclarativeengine_p.h +++ b/src/declarative/qml/qdeclarativeengine_p.h @@ -91,6 +91,7 @@ class QDeclarativeEngine; class QDeclarativeContextPrivate; class QDeclarativeExpression; class QDeclarativeContextScriptClass; +class QDeclarativeImportDatabase; class QDeclarativeObjectScriptClass; class QDeclarativeTypeNameScriptClass; class QDeclarativeValueTypeScriptClass; |