diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-01-25 13:26:14 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-01-25 13:26:14 (GMT) |
| commit | 195fbdfb7f9a8ade3347a651090722a7d3ecccfb (patch) | |
| tree | afd29e9eda1c4f898b1e6e78f23140e87454cdb5 /examples | |
| parent | 9657c4fa2040758b8aa3a5f7f7c81442cbaba621 (diff) | |
| parent | 67fbf125f3f96ea0ff0da66b1dd8b7dd348ca69f (diff) | |
| download | Qt-195fbdfb7f9a8ade3347a651090722a7d3ecccfb.zip Qt-195fbdfb7f9a8ade3347a651090722a7d3ecccfb.tar.gz Qt-195fbdfb7f9a8ade3347a651090722a7d3ecccfb.tar.bz2 | |
Merge branch '4.7' into jpasions-qt-doc-team-qtquick-4.7
Conflicts:
doc/src/declarative/extending.qdoc
doc/src/external-resources.qdoc
src/declarative/util/qdeclarativeanimation.cpp
src/declarative/util/qdeclarativetransition.cpp
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/declarative/toys/dynamicscene/dynamicscene.qml | 3 | ||||
| -rw-r--r-- | examples/tutorials/addressbook/part6/addressbook.cpp | 2 | ||||
| -rw-r--r-- | examples/tutorials/addressbook/part7/addressbook.cpp | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/examples/declarative/toys/dynamicscene/dynamicscene.qml b/examples/declarative/toys/dynamicscene/dynamicscene.qml index cfc4b74..a436b41 100644 --- a/examples/declarative/toys/dynamicscene/dynamicscene.qml +++ b/examples/declarative/toys/dynamicscene/dynamicscene.qml @@ -215,9 +215,10 @@ Item { PropertyChanges { target: stars; opacity: 0 } } + //! [top-level transitions] transitions: Transition { PropertyAnimation { duration: 3000 } ColorAnimation { duration: 3000 } } - + //! [top-level transitions] } diff --git a/examples/tutorials/addressbook/part6/addressbook.cpp b/examples/tutorials/addressbook/part6/addressbook.cpp index 64615c7..c7dc8e2 100644 --- a/examples/tutorials/addressbook/part6/addressbook.cpp +++ b/examples/tutorials/addressbook/part6/addressbook.cpp @@ -74,7 +74,7 @@ AddressBook::AddressBook(QWidget *parent) //! [tooltip 1] loadButton->setToolTip(tr("Load contacts from a file")); //! [tooltip 1] - saveButton = new QPushButton(tr("Sa&ve...")); + saveButton = new QPushButton(tr("&Save...")); //! [tooltip 2] saveButton->setToolTip(tr("Save contacts to a file")); //! [tooltip 2] diff --git a/examples/tutorials/addressbook/part7/addressbook.cpp b/examples/tutorials/addressbook/part7/addressbook.cpp index b04198c..501ad31 100644 --- a/examples/tutorials/addressbook/part7/addressbook.cpp +++ b/examples/tutorials/addressbook/part7/addressbook.cpp @@ -72,7 +72,7 @@ AddressBook::AddressBook(QWidget *parent) loadButton = new QPushButton(tr("&Load...")); loadButton->setToolTip(tr("Load contacts from a file")); - saveButton = new QPushButton(tr("Sa&ve...")); + saveButton = new QPushButton(tr("&Save...")); saveButton->setToolTip(tr("Save contacts to a file")); saveButton->setEnabled(false); |