Fix issues based on android testing

-Some includes were missing
-Widgets got on top of each other on openglSeries example
-qmloscilloscope didn't show button texts properly

Change-Id: I96cb64091275269f73d2a569ff53c2baae8b0f66
Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com>

3 files changed, 7 insertions, 5 deletions

diff --git a/examples/charts/openglseries/datasource.cpp b/examples/charts/openglseries/datasource.cpp
index 64b45405..0509d4fd 100644
--- a/examples/charts/openglseries/datasource.cpp
+++ b/examples/charts/openglseries/datasource.cpp
@@ -63,6 +63,7 @@ void DataSource::updateAllSeries()
         elapsed = m_fpsTimer.restart();
         qreal fps = qreal(0.1 * int(10000.0 * (qreal(frameCount) / qreal(elapsed))));
         m_fpsLabel->setText(labelText.arg(QString::number(fps, 'f', 1)));
+        m_fpsLabel->adjustSize();
         frameCount = 0;
     }
 }
diff --git a/examples/charts/openglseries/main.cpp b/examples/charts/openglseries/main.cpp
index 7b654a5d..01c6de54 100644
--- a/examples/charts/openglseries/main.cpp
+++ b/examples/charts/openglseries/main.cpp
@@ -148,11 +148,12 @@ int main(int argc, char *argv[])
     QLabel *countLabel = new QLabel(&window);
     QString countText = QStringLiteral("Total point count: %1");
     countLabel->setText(countText.arg(pointCount * seriesCount));
-    countLabel->resize(window.width(), countLabel->height());
-    fpsLabel->move(10,2);
+    countLabel->adjustSize();
+    fpsLabel->move(10, 2);
+    fpsLabel->adjustSize();
     fpsLabel->raise();
     fpsLabel->show();
-    countLabel->move(10, 14);
+    countLabel->move(10, fpsLabel->height());
     fpsLabel->raise();
     countLabel->show();
 
diff --git a/examples/charts/qmloscilloscope/qml/qmloscilloscope/ControlPanel.qml b/examples/charts/qmloscilloscope/qml/qmloscilloscope/ControlPanel.qml
index ccf53fa1..ddde6324 100644
--- a/examples/charts/qmloscilloscope/qml/qmloscilloscope/ControlPanel.qml
+++ b/examples/charts/qmloscilloscope/qml/qmloscilloscope/ControlPanel.qml
@@ -65,7 +65,7 @@ ColumnLayout {
     MultiButton {
         id: sampleCountButton
         text: "Samples: "
-        items: [6, 128, 1024, 10000]
+        items: ["6", "128", "1024", "10000"]
         currentSelection: 2
         onSelectionChanged: signalSourceChanged(
                                 signalSourceButton.items[signalSourceButton.currentSelection],
@@ -75,7 +75,7 @@ ColumnLayout {
 
     MultiButton {
         text: "Refresh rate: "
-        items: [1, 24, 60, 100]
+        items: ["1", "24", "60"]
         currentSelection: 2
         onSelectionChanged: refreshRateChanged(items[currentSelection]);
     }