summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--basicsuite/camera/CameraControlButton.qml2
-rw-r--r--basicsuite/camera/Controls.qml2
-rw-r--r--basicsuite/camera/FocusControl.qml2
-rw-r--r--basicsuite/ebike-ui/StatsPage.qml2
-rw-r--r--basicsuite/ebike-ui/main.qml2
-rw-r--r--basicsuite/mediaplayer/ControlBar.qml10
-rw-r--r--doc/b2qt-demos.qdoc2
-rw-r--r--doc/b2qt-demos.qdocconf10
-rw-r--r--wayland/democompositor/qml/Chrome.qml2
9 files changed, 17 insertions, 17 deletions
diff --git a/basicsuite/camera/CameraControlButton.qml b/basicsuite/camera/CameraControlButton.qml
index 58cc118..e4ca4bc 100644
--- a/basicsuite/camera/CameraControlButton.qml
+++ b/basicsuite/camera/CameraControlButton.qml
@@ -90,7 +90,7 @@ MouseArea {
Connections {
target: root
- onContentScaleChanged: valueTxt.font.pixelSize = Math.round(18 * root.contentScale)
+ function onContentScaleChanged() { valueTxt.font.pixelSize = Math.round(18 * root.contentScale) }
}
onTextChanged: font.pixelSize = Math.round(18 * root.contentScale)
diff --git a/basicsuite/camera/Controls.qml b/basicsuite/camera/Controls.qml
index 98f6183..6923ded 100644
--- a/basicsuite/camera/Controls.qml
+++ b/basicsuite/camera/Controls.qml
@@ -186,7 +186,7 @@ Item {
Connections {
target: camera
- onCaptureModeChanged: {
+ function onCaptureModeChanged() {
if (camera.captureMode === Camera.CaptureStillImage) {
resControl.model = cameraUtils.supportedCaptureResolutions;
} else {
diff --git a/basicsuite/camera/FocusControl.qml b/basicsuite/camera/FocusControl.qml
index 68c4642..9fa99ef 100644
--- a/basicsuite/camera/FocusControl.qml
+++ b/basicsuite/camera/FocusControl.qml
@@ -85,7 +85,7 @@ MouseArea {
Connections {
target: viewfinder
- onContentRectChanged: {
+ function onContentRectChanged() {
mappedRect = viewfinder.mapNormalizedRectToItem(area);
}
}
diff --git a/basicsuite/ebike-ui/StatsPage.qml b/basicsuite/ebike-ui/StatsPage.qml
index 2b3d418..9b204f0 100644
--- a/basicsuite/ebike-ui/StatsPage.qml
+++ b/basicsuite/ebike-ui/StatsPage.qml
@@ -65,7 +65,7 @@ Page {
// On new trip data (save clicked), switch index to new trip
Connections {
target: tripdata
- onTripDataSaved: tripView.setCurrentIndex(index)
+ function onTripDataSaved(index) { tripView.setCurrentIndex(index) }
}
RoundButton {
diff --git a/basicsuite/ebike-ui/main.qml b/basicsuite/ebike-ui/main.qml
index c6e3675..22396d1 100644
--- a/basicsuite/ebike-ui/main.qml
+++ b/basicsuite/ebike-ui/main.qml
@@ -264,6 +264,6 @@ Rectangle {
Connections {
target: datastore
- onDemoReset: drawer.close()
+ function onDemoReset() { drawer.close() }
}
}
diff --git a/basicsuite/mediaplayer/ControlBar.qml b/basicsuite/mediaplayer/ControlBar.qml
index cdf27f2..da422b3 100644
--- a/basicsuite/mediaplayer/ControlBar.qml
+++ b/basicsuite/mediaplayer/ControlBar.qml
@@ -208,22 +208,22 @@ Rectangle {
Connections {
target: mediaPlayer
- onVolumeChanged: volumeControl.volume = mediaPlayer.volume
+ function onVolumeChanged() { volumeControl.volume = mediaPlayer.volume }
}
}
Connections {
target: mediaPlayer
- onPositionChanged: {
+ function onPositionChanged() {
if (!seekControl.pressed) seekControl.position = mediaPlayer.position;
}
- onStatusChanged: {
+ function onStatusChanged() {
if ((mediaPlayer.status == MediaPlayer.Loaded) || (mediaPlayer.status == MediaPlayer.Buffered) || mediaPlayer.status === MediaPlayer.Buffering || mediaPlayer.status === MediaPlayer.EndOfMedia)
playbackControl.isPlaybackEnabled = true;
else
playbackControl.isPlaybackEnabled = false;
}
- onPlaybackStateChanged: {
+ function onPlaybackStateChanged() {
if (mediaPlayer.playbackState === MediaPlayer.PlayingState) {
playbackControl.isPlaying = true;
applicationWindow.resetTimer();
@@ -233,7 +233,7 @@ Rectangle {
}
}
- onSeekableChanged: {
+ function onSeekableChanged() {
seekControl.seekable = mediaPlayer.seekable;
}
}
diff --git a/doc/b2qt-demos.qdoc b/doc/b2qt-demos.qdoc
index a2e7973..7736ac7 100644
--- a/doc/b2qt-demos.qdoc
+++ b/doc/b2qt-demos.qdoc
@@ -50,7 +50,7 @@
/*!
\page index.html
- \title Qt 5.14.2 for Device Creation Examples and Demos
+ \title Qt 5.15.0 for Device Creation Examples and Demos
\SDK has a number of examples and demos. These are included in the
\B2Q images, available in the launcher that is run by default at
diff --git a/doc/b2qt-demos.qdocconf b/doc/b2qt-demos.qdocconf
index 2409f36..b3b7d2c 100644
--- a/doc/b2qt-demos.qdocconf
+++ b/doc/b2qt-demos.qdocconf
@@ -5,8 +5,8 @@ outputencoding = UTF-8
sourceencoding = UTF-8
project = QtforDeviceCreationDemos
-description = Qt 5.14.2 for Device Creation Examples and Demos
-version = 5.14.2
+description = Qt 5.15.0 for Device Creation Examples and Demos
+version = 5.15.0
sourcedirs = .
imagedirs += images
@@ -21,9 +21,9 @@ exampledirs = ..
qhp.projects = QtforDeviceCreationDemos
qhp.QtforDeviceCreationDemos.file = b2qt-demos.qhp
-qhp.QtforDeviceCreationDemos.namespace = org.qt-project.b2qt-demos.5142
+qhp.QtforDeviceCreationDemos.namespace = org.qt-project.b2qt-demos.5150
qhp.QtforDeviceCreationDemos.virtualFolder = b2qt-demos
-qhp.QtforDeviceCreationDemos.indexTitle = Qt 5.14.2 for Device Creation Examples and Demos
+qhp.QtforDeviceCreationDemos.indexTitle = Qt 5.15.0 for Device Creation Examples and Demos
qhp.QtforDeviceCreationDemos.indexRoot =
qhp.QtforDeviceCreationDemos.subprojects = demos
@@ -35,4 +35,4 @@ manifestmeta.b2qt.names = "QtforDeviceCreationDemos/*"
macro.B2Q = "Boot to Qt"
macro.SDK = "Qt for Device Creation"
-navigation.landingpage = "Qt 5.14.2 for Device Creation Examples and Demos"
+navigation.landingpage = "Qt 5.15.0 for Device Creation Examples and Demos"
diff --git a/wayland/democompositor/qml/Chrome.qml b/wayland/democompositor/qml/Chrome.qml
index 9c21cd1..e48b9d4 100644
--- a/wayland/democompositor/qml/Chrome.qml
+++ b/wayland/democompositor/qml/Chrome.qml
@@ -179,7 +179,7 @@ Rectangle {
Connections {
target: surface
- onSizeChanged: {
+ function onSizeChanged() {
valid = !surfaceItem.dead && !surface.cursorSurface && surface.size.width > 0 && surface.size.height > 0
//console.log(shellSurface.title + " surface size: " + surface.size + " curs: " + surface.cursorSurface + " valid: " + valid)
}