diff options
Diffstat (limited to 'demos/declarative')
| -rw-r--r-- | demos/declarative/minehunt/minehunt.pro | 1 | ||||
| -rw-r--r-- | demos/declarative/samegame/samegame.qml | 4 | ||||
| -rw-r--r-- | demos/declarative/snake/content/Link.qml | 2 | ||||
| -rw-r--r-- | demos/declarative/webbrowser/content/FlickableWebView.qml | 5 | ||||
| -rw-r--r-- | demos/declarative/webbrowser/webbrowser.qml | 2 |
5 files changed, 9 insertions, 5 deletions
diff --git a/demos/declarative/minehunt/minehunt.pro b/demos/declarative/minehunt/minehunt.pro index 91d02cf..aac91f6 100644 --- a/demos/declarative/minehunt/minehunt.pro +++ b/demos/declarative/minehunt/minehunt.pro @@ -24,7 +24,6 @@ MinehuntCore_sources.path = $$[QT_INSTALL_DEMOS]/declarative/minehunt/MinehuntCo INSTALLS = sources MinehuntCore_sources target symbian:{ - load(data_caging_paths) TARGET.EPOCALLOWDLLDATA = 1 include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) TARGET.CAPABILITY = NetworkServices ReadUserData diff --git a/demos/declarative/samegame/samegame.qml b/demos/declarative/samegame/samegame.qml index 9a721da..10bf79f 100644 --- a/demos/declarative/samegame/samegame.qml +++ b/demos/declarative/samegame/samegame.qml @@ -46,6 +46,7 @@ import "SamegameCore/samegame.js" as Logic Rectangle { id: screen width: 490; height: 720 + property bool inAnotherDemo: false //Samegame often is just plonked straight into other demos SystemPalette { id: activePalette } @@ -115,6 +116,8 @@ Rectangle { id: nameInputText anchors { verticalCenter: parent.verticalCenter; left: dialogText.right } focus: false + autoScroll: false + maximumLength: 24 onTextChanged: { var newWidth = nameInputText.width + dialogText.width + 40; if ( (newWidth > nameInputDialog.width && newWidth < screen.width) @@ -141,6 +144,7 @@ Rectangle { } Button { + visible: !inAnotherDemo text: "Quit" anchors { left: newGameButton.right; leftMargin: 3; verticalCenter: parent.verticalCenter } onClicked: Qt.quit(); diff --git a/demos/declarative/snake/content/Link.qml b/demos/declarative/snake/content/Link.qml index 9aa6006..f4d7165 100644 --- a/demos/declarative/snake/content/Link.qml +++ b/demos/declarative/snake/content/Link.qml @@ -73,12 +73,14 @@ Item { id:link } } + /* transform: Rotation { id: actualImageRotation origin.x: width/2; origin.y: height/2; angle: rotation * 90 Behavior on angle { NumberAnimation { duration: spawned ? 200 : 0} } } + */ } Image { diff --git a/demos/declarative/webbrowser/content/FlickableWebView.qml b/demos/declarative/webbrowser/content/FlickableWebView.qml index 62da2ea..fb479d2 100644 --- a/demos/declarative/webbrowser/content/FlickableWebView.qml +++ b/demos/declarative/webbrowser/content/FlickableWebView.qml @@ -40,7 +40,7 @@ ****************************************************************************/ import Qt 4.7 -import org.webkit 1.0 +import QtWebKit 1.0 Flickable { property alias title: webView.title @@ -90,7 +90,6 @@ Flickable { url: fixUrl(webBrowser.urlString) smooth: false // We don't want smooth scaling, since we only scale during (fast) transitions focus: true - zoomFactor: 1 onAlert: console.log(message) @@ -114,7 +113,7 @@ Flickable { preferredWidth: flickable.width preferredHeight: flickable.height - contentsScale: 1/zoomFactor + contentsScale: 1 onContentsSizeChanged: { // zoom out contentsScale = Math.min(1,flickable.width / contentsSize.width) diff --git a/demos/declarative/webbrowser/webbrowser.qml b/demos/declarative/webbrowser/webbrowser.qml index 53ba6da..3bff0fe 100644 --- a/demos/declarative/webbrowser/webbrowser.qml +++ b/demos/declarative/webbrowser/webbrowser.qml @@ -40,7 +40,7 @@ ****************************************************************************/ import Qt 4.7 -import org.webkit 1.0 +import QtWebKit 1.0 import "content" |