HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2826:78282651dc64

Fix issues based on android testing...

Miikka Heikkinen -

r2826:78282651dc64

parent child

Context file:

r2826:78282651dc64

examples/charts/openglseries/datasource.cpp +1 0

                     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;
                 }
             }

examples/charts/openglseries/main.cpp +4 -3

                 QLabel *countLabel = new QLabel(&window);
                 QString countText = QStringLiteral("Total point count: %1");
                 countLabel->setText(countText.arg(pointCount * seriesCount));
-                countLabel->resize(window.width(), countLabel->height());
+                countLabel->adjustSize();
-                fpsLabel->move(10,2);
+                fpsLabel->move(10, 2);
+                fpsLabel->adjustSize();
                 fpsLabel->raise();
                 fpsLabel->show();
-                countLabel->move(10, 14);
+                countLabel->move(10, fpsLabel->height());
                 fpsLabel->raise();
                 countLabel->show();

examples/charts/qmloscilloscope/qml/qmloscilloscope/ControlPanel.qml +2 -2

                 MultiButton {
                     id: sampleCountButton
                     text: "Samples: "
-                    items: [6, 128, 1024, 10000]
+                    items: ["6", "128", "1024", "10000"]
                     currentSelection: 2
                     onSelectionChanged: signalSourceChanged(
                                             signalSourceButton.items[signalSourceButton.currentSelection],
                 MultiButton {
                     text: "Refresh rate: "
-                    items: [1, 24, 60, 100]
+                    items: ["1", "24", "60"]
                     currentSelection: 2
                     onSelectionChanged: refreshRateChanged(items[currentSelection]);
                 }

src/charts/chartitem.cpp +1 0

             #include <private/chartitem_p.h>
             #include <private/qabstractseries_p.h>
             #include <private/abstractdomain_p.h>
+            #include <QtGui/QPainter>
             QT_CHARTS_BEGIN_NAMESPACE

src/charts/chartpresenter.cpp +1 0

             #include <private/charttitle_p.h>
             #include <QtCore/QTimer>
             #include <QtGui/QTextDocument>
+            #include <QtWidgets/QGraphicsScene>
             QT_CHARTS_BEGIN_NAMESPACE

src/charts/chartpresenter_p.h +1 0

             #include <QtCore/QMargins>
             #include <QtCore/QLocale>
             #include <QtCore/QPointer>
+            #include <QtCore/QEasingCurve>
             QT_CHARTS_BEGIN_NAMESPACE

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages