diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-05-13 15:55:50 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-05-13 15:55:50 (GMT) |
| commit | 4adf280fb6bda8e519bf23606b841e040cb04fab (patch) | |
| tree | 88eda2f4f5cf46c9e68fa4aea7ca832aaa6c65db /examples/declarative | |
| parent | d9ef2f580bd78e658064e4fa3d0acf73b9c2a921 (diff) | |
| parent | f32438ffccd8728143b93399e7cd251e72d23b55 (diff) | |
| download | Qt-4adf280fb6bda8e519bf23606b841e040cb04fab.zip Qt-4adf280fb6bda8e519bf23606b841e040cb04fab.tar.gz Qt-4adf280fb6bda8e519bf23606b841e040cb04fab.tar.bz2 | |
Merge branch '4.8'
Conflicts:
doc/src/declarative/whatsnew.qdoc
doc/src/examples/orientation.qdoc
doc/src/examples/webftpclient.qdoc
examples/declarative/ui-components/main/qml/pics/niagara_falls.jpg
src/corelib/global/qglobal.cpp
src/gui/text/qglyphs.cpp
src/gui/text/qplatformfontdatabase_qpa.cpp
Diffstat (limited to 'examples/declarative')
| -rw-r--r-- | examples/declarative/touchinteraction/touchinteraction.pro | 4 | ||||
| -rw-r--r-- | examples/declarative/ui-components/main/qml/pics/niagara_falls.jpg | bin | 604121 -> 100161 bytes |
2 files changed, 4 insertions, 0 deletions
diff --git a/examples/declarative/touchinteraction/touchinteraction.pro b/examples/declarative/touchinteraction/touchinteraction.pro new file mode 100644 index 0000000..1beaeab --- /dev/null +++ b/examples/declarative/touchinteraction/touchinteraction.pro @@ -0,0 +1,4 @@ +TEMPLATE = subdirs +SUBDIRS = gestures \ + mousearea \ + pincharea diff --git a/examples/declarative/ui-components/main/qml/pics/niagara_falls.jpg b/examples/declarative/ui-components/main/qml/pics/niagara_falls.jpg Binary files differindex 618d808..d255543 100644 --- a/examples/declarative/ui-components/main/qml/pics/niagara_falls.jpg +++ b/examples/declarative/ui-components/main/qml/pics/niagara_falls.jpg |
