diff --git a/examples/charts/openglseries/datasource.cpp b/examples/charts/openglseries/datasource.cpp index 64b4540..0509d4f 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 7b654a5..01c6de5 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 ccf53fa..ddde632 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]); } diff --git a/src/charts/chartitem.cpp b/src/charts/chartitem.cpp index 42a3f2e..bdecbfc 100644 --- a/src/charts/chartitem.cpp +++ b/src/charts/chartitem.cpp @@ -19,6 +19,7 @@ #include #include #include +#include QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/chartpresenter.cpp b/src/charts/chartpresenter.cpp index 6fc3503..2bac63c 100644 --- a/src/charts/chartpresenter.cpp +++ b/src/charts/chartpresenter.cpp @@ -32,6 +32,7 @@ #include #include #include +#include QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/chartpresenter_p.h b/src/charts/chartpresenter_p.h index 8dadbbc..b571471 100644 --- a/src/charts/chartpresenter_p.h +++ b/src/charts/chartpresenter_p.h @@ -35,6 +35,7 @@ #include #include #include +#include QT_CHARTS_BEGIN_NAMESPACE