summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@qt.io>2016-08-17 13:30:12 +0300
committerMiikka Heikkinen <miikka.heikkinen@qt.io>2016-08-17 11:32:27 +0000
commitb63e0069a18e9d49a8c961d5fa27325c527507a1 (patch)
tree2a7740f8747f7caf6fcb525bab5aa90338252983 /examples
parent2d3532204c720e2adaefd30dc18e606fcec98598 (diff)
Fix antialiasing support of OpenGL accelerated series
OpenGL accelerated series are now antialiased similarly to non-accelerated series. Task-number: QTRD-2172 Change-Id: Ie8bc014c82d5fa645cf41ab56bebb99fcf8ad301 Reviewed-by: Mika Salmela <mika.salmela@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'examples')
-rw-r--r--examples/charts/qmloscilloscope/qml/qmloscilloscope/ControlPanel.qml2
-rw-r--r--examples/charts/qmloscilloscope/qml/qmloscilloscope/main.qml2
2 files changed, 1 insertions, 3 deletions
diff --git a/examples/charts/qmloscilloscope/qml/qmloscilloscope/ControlPanel.qml b/examples/charts/qmloscilloscope/qml/qmloscilloscope/ControlPanel.qml
index 19277a09..fe3bc869 100644
--- a/examples/charts/qmloscilloscope/qml/qmloscilloscope/ControlPanel.qml
+++ b/examples/charts/qmloscilloscope/qml/qmloscilloscope/ControlPanel.qml
@@ -96,7 +96,7 @@ ColumnLayout {
id: antialiasButton
text: "Antialias: "
items: ["OFF", "ON"]
- enabled: false
+ enabled: true
currentSelection: 0
onSelectionChanged: antialiasingEnabled(currentSelection == 1);
}
diff --git a/examples/charts/qmloscilloscope/qml/qmloscilloscope/main.qml b/examples/charts/qmloscilloscope/qml/qmloscilloscope/main.qml
index 7c6b2cd7..a8260564 100644
--- a/examples/charts/qmloscilloscope/qml/qmloscilloscope/main.qml
+++ b/examples/charts/qmloscilloscope/qml/qmloscilloscope/main.qml
@@ -56,8 +56,6 @@ Item {
onAntialiasingEnabled: scopeView.antialiasing = enabled;
onOpenGlChanged: {
scopeView.openGL = enabled;
- antialiasButton.enabled = !enabled;
- antialiasButton.currentSelection = 0;
}
}