diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-13 23:40:55 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-13 23:40:55 (GMT) |
| commit | ac519ee416e06f4ab471f102da306f94de21c90d (patch) | |
| tree | 7ae2cbba367996618d2c73a2d7b06f09aef5cdf2 /src/declarative/qml/qdeclarativeworkerscript_p.h | |
| parent | 115b7172d54a5a331b9e00d20f6694749179c484 (diff) | |
| parent | 8c6b5c53a2f6f8c9113fa616b458dde0be86a9e2 (diff) | |
| download | Qt-ac519ee416e06f4ab471f102da306f94de21c90d.zip Qt-ac519ee416e06f4ab471f102da306f94de21c90d.tar.gz Qt-ac519ee416e06f4ab471f102da306f94de21c90d.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: (159 commits)
Doc: Adding loading image to search textbox
qdoc: Yet another revision of the top doc page.
Doc: Update on web template
Added QDateTime::msecsTo()
Doc: Fixed tables and images for the new docs
qdoc: Yet another revision of the top doc page.
Revert "Improve QUrl handling of local file paths"
Revert "[QNAM FTP] Check for the "ftp" scheme case-insensitively"
Revert "QUrl::fromLocalFile: fix silly mistake: it's fromNativeSeparators, not to"
Revert "Use QUrl::isLocalFile and fix the scheme checking in local URLs."
qdoc: Another revision of the top doc page.
Doc correction to css
Doc: Updates to the html template and javascript
tst_SuiteTest: Fix a meaningless switch statement
My 4.7.0 changelog entries.
qdoc: Fixed annotated list generation to use <td>, not <th>.
Doc: Tuning search script
qdoc: Reorganized examples panel.
Doc: Chages to search feature, css and table order
QtDeclarative: avoid waiting for a network load on URIs with empty schemes.
...
Diffstat (limited to 'src/declarative/qml/qdeclarativeworkerscript_p.h')
| -rw-r--r-- | src/declarative/qml/qdeclarativeworkerscript_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativeworkerscript_p.h b/src/declarative/qml/qdeclarativeworkerscript_p.h index 80ef5f3..dc73811 100644 --- a/src/declarative/qml/qdeclarativeworkerscript_p.h +++ b/src/declarative/qml/qdeclarativeworkerscript_p.h @@ -122,7 +122,7 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QDeclarativeWorkerScript); +QML_DECLARE_TYPE(QDeclarativeWorkerScript) QT_END_HEADER |