Merge remote-tracking branch 'gerrit/dev' into neard

Change-Id: I3d03b2306a8e9e0e176f16475274134af973e631

5 files changed, 17 insertions, 12 deletions

diff --git a/examples/bluetooth/lowenergyscanner/assets/Header.qml b/examples/bluetooth/lowenergyscanner/assets/Header.qml
index 0c8bc2c5..721dc05c 100644
--- a/examples/bluetooth/lowenergyscanner/assets/Header.qml
+++ b/examples/bluetooth/lowenergyscanner/assets/Header.qml
@@ -54,7 +54,7 @@ Rectangle {
         anchors.fill: parent
         text: headerText
         font.bold: true
-        font.pixelSize: 30
+        font.pointSize: 20
         elide: Text.ElideMiddle
         color: "#363636"
     }
diff --git a/examples/bluetooth/lowenergyscanner/assets/Label.qml b/examples/bluetooth/lowenergyscanner/assets/Label.qml
index 5443ee6b..aafda900 100644
--- a/examples/bluetooth/lowenergyscanner/assets/Label.qml
+++ b/examples/bluetooth/lowenergyscanner/assets/Label.qml
@@ -42,7 +42,7 @@ import QtQuick 2.0
 
 Text {
     property string textContent: ""
-    font.pixelSize: 30
+    font.pointSize: 20
     anchors.horizontalCenter: parent.horizontalCenter
     color: "#363636"
     horizontalAlignment: Text.AlignHCenter
diff --git a/examples/bluetooth/lowenergyscanner/assets/Services.qml b/examples/bluetooth/lowenergyscanner/assets/Services.qml
index a536152d..d593c7d5 100644
--- a/examples/bluetooth/lowenergyscanner/assets/Services.qml
+++ b/examples/bluetooth/lowenergyscanner/assets/Services.qml
@@ -76,6 +76,10 @@ Rectangle {
             else
                 info.visible = false;
         }
+
+        onDisconnected: {
+            pageLoader.source = "main.qml"
+        }
     }
 
     ListView {
diff --git a/examples/nfc/ndefeditor/mimeimagerecordeditor.cpp b/examples/nfc/ndefeditor/mimeimagerecordeditor.cpp
index 134d674c..5ed733a4 100644
--- a/examples/nfc/ndefeditor/mimeimagerecordeditor.cpp
+++ b/examples/nfc/ndefeditor/mimeimagerecordeditor.cpp
@@ -134,6 +134,7 @@ void MimeImageRecordEditor::on_mimeImageOpen_clicked()
     ui->mimeImageFile->setText(mimeDataFile);
     ui->mimeImageImage->setPixmap(QPixmap::fromImage(image));
 
+    m_record.setTypeNameFormat(QNdefRecord::Mime);
     m_record.setType(mimeType.toLatin1());
     m_record.setPayload(imageData);
 }
diff --git a/examples/nfc/poster/poster.qml b/examples/nfc/poster/poster.qml
index a9ad9a2b..89e6af19 100644
--- a/examples/nfc/poster/poster.qml
+++ b/examples/nfc/poster/poster.qml
@@ -91,7 +91,7 @@ Rectangle {
                     }
                     break;
                 case NdefRecord.Mime:
-                    if (messageRecords[i].type.startsWith("image/")) {
+                    if (messageRecords[i].type.indexOf("image/") === 0 ) {
                         posterImage.source = messageRecords[i].uri;
                         found = true;
                     }
@@ -115,15 +115,6 @@ Rectangle {
         font.pointSize: 18
     }
 
-    Text {
-        id: posterText
-        anchors.horizontalCenter: parent.right
-        anchors.horizontalCenterOffset: - parent.width / 4
-        y: -height
-        font.bold: true
-        font.pointSize: 18
-    }
-
     Image {
         id: posterImage
         scale: Image.PreserveAspectFit
@@ -135,6 +126,15 @@ Rectangle {
     }
 
     Text {
+        id: posterText
+        anchors.horizontalCenter: parent.right
+        anchors.horizontalCenterOffset: - parent.width / 4
+        y: -height
+        font.bold: true
+        font.pointSize: 18
+    }
+
+    Text {
         id: posterUrl
         anchors.horizontalCenter: parent.right
         anchors.horizontalCenterOffset: - parent.width / 4