diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-22 11:08:04 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-22 11:08:04 (GMT) |
| commit | a0d5f436551bfc15b9994220f4cb168cf802c874 (patch) | |
| tree | 32923325a125335edd5fc05df9d2bf40fe16b52a /doc/src/declarative/qtdeclarative.qdoc | |
| parent | 8ec200f756b021b5c79bcd328815efc5eafda578 (diff) | |
| parent | 2066945370f9d34cf9cff52f87d2f0e78dcb5b09 (diff) | |
| download | Qt-a0d5f436551bfc15b9994220f4cb168cf802c874.zip Qt-a0d5f436551bfc15b9994220f4cb168cf802c874.tar.gz Qt-a0d5f436551bfc15b9994220f4cb168cf802c874.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: (108 commits)
Doc: Fixed spelling errors that were blocking the CI system.
QDeclarativeDebug: Fix cases where multiple packets arrive in one go
Fix build break in S60 5.0 environment
Added missing license headers.
Skip softkeys update if application is not on foreground in Symbian
Revert "Opening taskswitcher, pushes application softkeys to top of switcher"
DEF file updates for Symbian
QTBUG-19883 Adding top level TRAP for QThreads on Symbian
Added missing license headers.
Fix js debugging autotest on Windows + Add license header
Rewrite autotests for js debugging
Revert "QFileInfoGatherer: call QFileSystemWatcher addPaths from proper thread"
Rename qdeclarativescriptdebugging autotest directory
Fix alignment value not handled in ODF
Silence a compiler warning about unhandled enum in switch
Silence the "array out of bounds" warning in GCC 4.6.
Silence the callgrind warnings in our source code when using gcc 4.6
Create a function that merges the SSE common code
Improve toLatin1 x86 SIMD by using a new SSE4.1 instruction
QFileInfoGatherer: call QFileSystemWatcher addPaths from proper thread
...
Diffstat (limited to 'doc/src/declarative/qtdeclarative.qdoc')
| -rw-r--r-- | doc/src/declarative/qtdeclarative.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/declarative/qtdeclarative.qdoc b/doc/src/declarative/qtdeclarative.qdoc index 027bb2e..75420d5 100644 --- a/doc/src/declarative/qtdeclarative.qdoc +++ b/doc/src/declarative/qtdeclarative.qdoc @@ -210,4 +210,4 @@ #include <QtDeclarative> to use this function. Returns the QML type id. - */ +*/ |