diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-06-22 22:36:13 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-06-22 22:36:13 (GMT) |
| commit | 27d59016d35ae84d89e8d09bdadb1c3a89ac3f22 (patch) | |
| tree | f493da0591281db183c23c86ecc3dc078009cafa /src/declarative/util | |
| parent | b92a7337d47e8b1be2d65d5a726f7a6f291a65bb (diff) | |
| parent | 5d3b132dd94f6c985fa3f9584dedb46823acddfe (diff) | |
| download | Qt-27d59016d35ae84d89e8d09bdadb1c3a89ac3f22.zip Qt-27d59016d35ae84d89e8d09bdadb1c3a89ac3f22.tar.gz Qt-27d59016d35ae84d89e8d09bdadb1c3a89ac3f22.tar.bz2 | |
Merge remote branch 'origin/4.7' into qml-4.7
Conflicts:
examples/declarative/modelviews/webview/transparent.qml
Diffstat (limited to 'src/declarative/util')
| -rw-r--r-- | src/declarative/util/qdeclarativepackage.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/util/qdeclarativepackage.cpp b/src/declarative/util/qdeclarativepackage.cpp index b149120..1e49ad9 100644 --- a/src/declarative/util/qdeclarativepackage.cpp +++ b/src/declarative/util/qdeclarativepackage.cpp @@ -74,7 +74,7 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlattachedproperty bool Package::name + \qmlattachedproperty string Package::name This attached property holds the name of an item within a Package. */ |