diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-09-14 12:36:58 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-09-14 12:36:58 (GMT) |
| commit | 7769e7bf79f0c17a01874fa0b3f1b227c1e41e93 (patch) | |
| tree | e69de39b2e33323b8213d0d7e7469bd33d9fb60e /demos | |
| parent | 6cd8a6001fe87107d32524c6115d37b620d3e108 (diff) | |
| parent | 8399cce50eb11db885e67a52055505951309cae8 (diff) | |
| download | Qt-7769e7bf79f0c17a01874fa0b3f1b227c1e41e93.zip Qt-7769e7bf79f0c17a01874fa0b3f1b227c1e41e93.tar.gz Qt-7769e7bf79f0c17a01874fa0b3f1b227c1e41e93.tar.bz2 | |
Merge branch '4.7' of ../qt-doc-team into 4.7
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/declarative/twitter/TwitterCore/TitleBar.qml | 13 | ||||
| -rw-r--r-- | demos/embedded/flightinfo/flightinfo.pro | 2 | ||||
| -rw-r--r-- | demos/embedded/weatherinfo/weatherinfo.pro | 2 |
3 files changed, 12 insertions, 5 deletions
diff --git a/demos/declarative/twitter/TwitterCore/TitleBar.qml b/demos/declarative/twitter/TwitterCore/TitleBar.qml index 145c189..70de81d 100644 --- a/demos/declarative/twitter/TwitterCore/TitleBar.qml +++ b/demos/declarative/twitter/TwitterCore/TitleBar.qml @@ -94,10 +94,21 @@ Item { } } + Image { + id: quitButton + x: 5 + anchors.verticalCenter: parent.verticalCenter + source: "images/quit.png" + MouseArea { + anchors.fill: parent + onClicked: Qt.quit() + } + } + Text { id: categoryText anchors { - left: imageBox.right; right: parent.right; leftMargin: 10; rightMargin: 10 + left: quitButton.right; right: parent.right; leftMargin: 10; rightMargin: 10 verticalCenter: parent.verticalCenter } elide: Text.ElideLeft diff --git a/demos/embedded/flightinfo/flightinfo.pro b/demos/embedded/flightinfo/flightinfo.pro index 985cc42..bd21e97 100644 --- a/demos/embedded/flightinfo/flightinfo.pro +++ b/demos/embedded/flightinfo/flightinfo.pro @@ -8,8 +8,6 @@ QT += network symbian { TARGET.UID3 = 0xA000CF74 include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) - INCLUDEPATH += $$QT_SOURCE_TREE/examples/network/qftp/ - LIBS += -lesock -lcommdb -linsock # For IAP selection TARGET.CAPABILITY = NetworkServices } diff --git a/demos/embedded/weatherinfo/weatherinfo.pro b/demos/embedded/weatherinfo/weatherinfo.pro index 9addbbb..bc9b966 100644 --- a/demos/embedded/weatherinfo/weatherinfo.pro +++ b/demos/embedded/weatherinfo/weatherinfo.pro @@ -7,8 +7,6 @@ QT += network svg symbian { TARGET.UID3 = 0xA000CF77 include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) - INCLUDEPATH += $$QT_SOURCE_TREE/examples/network/qftp/ - LIBS += -lesock -lcommdb -linsock # For IAP selection TARGET.CAPABILITY = NetworkServices } |