Merge "Merge remote-tracking branch 'origin/5.15' into dev"

4 files changed, 14 insertions, 8 deletions

diff --git a/examples/charts/boxplotchart/boxdatareader.cpp b/examples/charts/boxplotchart/boxdatareader.cpp
index f634bd4e..b967512b 100644
--- a/examples/charts/boxplotchart/boxdatareader.cpp
+++ b/examples/charts/boxplotchart/boxdatareader.cpp
@@ -50,7 +50,7 @@ QBoxSet *BoxDataReader::readBox()
     //! [1]
 
     //! [2]
-    QStringList strList = line.split(" ", QString::SkipEmptyParts);
+    QStringList strList = line.split(QLatin1Char(' '), Qt::SkipEmptyParts);
     //! [2]
 
     //! [3]
diff --git a/examples/charts/candlestickchart/candlestickdatareader.cpp b/examples/charts/candlestickchart/candlestickdatareader.cpp
index 83228efd..fb3dcae2 100644
--- a/examples/charts/candlestickchart/candlestickdatareader.cpp
+++ b/examples/charts/candlestickchart/candlestickdatareader.cpp
@@ -52,7 +52,7 @@ QCandlestickSet *CandlestickDataReader::readCandlestickSet()
     //! [1]
 
     //! [2]
-    QStringList strList = line.split(" ", QString::SkipEmptyParts);
+    QStringList strList = line.split(QLatin1Char(' '), Qt::SkipEmptyParts);
     if (strList.count() != 5)
         return 0;
     //! [2]
diff --git a/examples/charts/datetimeaxis/main.cpp b/examples/charts/datetimeaxis/main.cpp
index ca3f4320..134d39da 100644
--- a/examples/charts/datetimeaxis/main.cpp
+++ b/examples/charts/datetimeaxis/main.cpp
@@ -62,7 +62,7 @@ int main(int argc, char *argv[])
         QString line = stream.readLine();
         if (line.startsWith("#") || line.startsWith(":"))
             continue;
-        QStringList values = line.split(" ", QString::SkipEmptyParts);
+        QStringList values = line.split(QLatin1Char(' '), Qt::SkipEmptyParts);
         QDateTime momentInTime;
         momentInTime.setDate(QDate(values[0].toInt(), values[1].toInt() , 15));
         series->append(momentInTime.toMSecsSinceEpoch(), values[2].toDouble());
diff --git a/examples/charts/piechartcustomization/mainwidget.cpp b/examples/charts/piechartcustomization/mainwidget.cpp
index 4a7a1243..482ff9b9 100644
--- a/examples/charts/piechartcustomization/mainwidget.cpp
+++ b/examples/charts/piechartcustomization/mainwidget.cpp
@@ -81,7 +81,10 @@ MainWidget::MainWidget(QWidget *parent)
 
     m_legendCheckBox = new QCheckBox();
 
-    QFormLayout *chartSettingsLayout = new QFormLayout();
+    QScrollArea *settingsScrollBar = new QScrollArea();
+    QWidget *settingsContentWidget = new QWidget();
+
+    QFormLayout *chartSettingsLayout = new QFormLayout(settingsContentWidget);
     chartSettingsLayout->addRow("Theme", m_themeComboBox);
     chartSettingsLayout->addRow("Antialiasing", m_aaCheckBox);
     chartSettingsLayout->addRow("Animations", m_animationsCheckBox);
@@ -136,7 +139,7 @@ MainWidget::MainWidget(QWidget *parent)
     QPushButton *insertSlice = new QPushButton("Insert slice");
     QPushButton *removeSlice = new QPushButton("Remove selected slice");
 
-    QFormLayout *seriesSettingsLayout = new QFormLayout();
+    QFormLayout *seriesSettingsLayout = new QFormLayout(settingsContentWidget);
     seriesSettingsLayout->addRow("Horizontal position", m_hPosition);
     seriesSettingsLayout->addRow("Vertical position", m_vPosition);
     seriesSettingsLayout->addRow("Size factor", m_sizeFactor);
@@ -195,7 +198,7 @@ MainWidget::MainWidget(QWidget *parent)
     m_labelPosition->addItem("Inside tangential", QPieSlice::LabelInsideTangential);
     m_labelPosition->addItem("Inside normal", QPieSlice::LabelInsideNormal);
 
-    QFormLayout *sliceSettingsLayout = new QFormLayout();
+    QFormLayout *sliceSettingsLayout = new QFormLayout(settingsContentWidget);
     sliceSettingsLayout->addRow("Label", m_sliceName);
     sliceSettingsLayout->addRow("Value", m_sliceValue);
     sliceSettingsLayout->addRow("Pen", m_pen);
@@ -239,10 +242,13 @@ MainWidget::MainWidget(QWidget *parent)
     settingsLayout->addWidget(chartSettings);
     settingsLayout->addWidget(seriesSettings);
     settingsLayout->addWidget(sliceSettings);
-    settingsLayout->addStretch();
+
+    settingsContentWidget->setLayout(settingsLayout);
+    settingsScrollBar->setWidget(settingsContentWidget);
+    settingsScrollBar->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
 
     QGridLayout *baseLayout = new QGridLayout();
-    baseLayout->addLayout(settingsLayout, 0, 0);
+    baseLayout->addWidget(settingsScrollBar, 0, 0);
     baseLayout->addWidget(m_chartView, 0, 1);
     setLayout(baseLayout);