diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-09-21 08:06:18 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-09-21 08:06:18 (GMT) |
| commit | a4d1be727573a7a87c523a2ef28074c77d16f165 (patch) | |
| tree | d4f8f218c41771ca17c7ab324390485af868fa8e /dist | |
| parent | cd2fd21578a80bc5ac121c0419ee00b1799d0a60 (diff) | |
| parent | 660ec910ef60513b511e2292255e53701dbb239b (diff) | |
| download | Qt-a4d1be727573a7a87c523a2ef28074c77d16f165.zip Qt-a4d1be727573a7a87c523a2ef28074c77d16f165.tar.gz Qt-a4d1be727573a7a87c523a2ef28074c77d16f165.tar.bz2 | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
src/corelib/kernel/qobject.h
src/declarative/graphicsitems/qdeclarativeflickable.cpp
src/declarative/graphicsitems/qdeclarativeflickable_p_p.h
src/declarative/util/qdeclarativelistmodel.cpp
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/changes-4.7.0 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/dist/changes-4.7.0 b/dist/changes-4.7.0 index a5939e3..53e51f8 100644 --- a/dist/changes-4.7.0 +++ b/dist/changes-4.7.0 @@ -371,6 +371,10 @@ Qt for Symbian - QSplashScreen * [QTBUG-11129] Fixed a hanging bug in QSplashScreen on 3.1 devices. + - QS60Main... classes + * The future compatibility of QS60MainAppUi, QS60MainDocument and + QS60MainApplication are improved by removing the need for any + sub-class to link to Avkon functions that may not exist in future. **************************************************************************** |