From 5d24897d356bdc4f869cd7dfbe8114e652a34b9e Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Thu, 13 Nov 2014 16:26:01 +0200 Subject: Fix typo in docs Change-Id: Iad4d07765b9f1310baf3b43d5307906c9887bca6 Reviewed-by: Miikka Heikkinen --- examples/datavisualization/qmloscilloscope/doc/src/qmloscilloscope.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/datavisualization/qmloscilloscope/doc/src/qmloscilloscope.qdoc b/examples/datavisualization/qmloscilloscope/doc/src/qmloscilloscope.qdoc index 723ad826..352e2a36 100644 --- a/examples/datavisualization/qmloscilloscope/doc/src/qmloscilloscope.qdoc +++ b/examples/datavisualization/qmloscilloscope/doc/src/qmloscilloscope.qdoc @@ -49,7 +49,7 @@ \snippet qmloscilloscope/datasource.cpp 0 - The secod method, \c update(), copies one set of the cached data into another array, which we + The second method, \c update(), copies one set of the cached data into another array, which we set to the data proxy of the series by calling QSurfaceDataProxy::resetArray(). We reuse the same array if the array dimensions have not changed to minimize overhead: -- cgit v1.2.3 From 6c1c470c1664f68951f0e402e9dae8048c625e8b Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Fri, 14 Nov 2014 13:25:20 +0100 Subject: renaming toolTip to tooltip This was changed in Qt Creator 3.3 for consistency reasons. Change-Id: I164b5bff88b2cc3091aaf48e57fb12ef60e2a6aa Reviewed-by: Miikka Heikkinen Reviewed-by: Tim Jenssen --- .../designer/Bars3DSpecifics.qml | 32 +++++++++++----------- .../designer/Scatter3DSpecifics.qml | 24 ++++++++-------- .../designer/Surface3DSpecifics.qml | 24 ++++++++-------- 3 files changed, 40 insertions(+), 40 deletions(-) diff --git a/src/datavisualizationqml2/designer/Bars3DSpecifics.qml b/src/datavisualizationqml2/designer/Bars3DSpecifics.qml index d89d1a54..6ec30e7d 100644 --- a/src/datavisualizationqml2/designer/Bars3DSpecifics.qml +++ b/src/datavisualizationqml2/designer/Bars3DSpecifics.qml @@ -33,7 +33,7 @@ Column { SectionLayout { Label { text: qsTr("multiSeriesUniform") - toolTip: qsTr("Multiseries Uniform") + tooltip: qsTr("Multiseries Uniform") Layout.fillWidth: true } SecondColumnLayout { @@ -44,7 +44,7 @@ Column { } Label { text: qsTr("barThickness") - toolTip: qsTr("Bar Thickness Ratio") + tooltip: qsTr("Bar Thickness Ratio") Layout.fillWidth: true } SecondColumnLayout { @@ -59,7 +59,7 @@ Column { } Label { text: qsTr("barSpacing") - toolTip: qsTr("Bar Spacing") + tooltip: qsTr("Bar Spacing") Layout.fillWidth: true } SecondColumnLayout { @@ -84,7 +84,7 @@ Column { } Label { text: qsTr("barSpacingRelative") - toolTip: qsTr("Bar Spacing Relative") + tooltip: qsTr("Bar Spacing Relative") Layout.fillWidth: true } SecondColumnLayout { @@ -95,7 +95,7 @@ Column { } Label { text: qsTr("renderingMode") - toolTip: qsTr("Rendering Mode") + tooltip: qsTr("Rendering Mode") Layout.fillWidth: true } SecondColumnLayout { @@ -109,7 +109,7 @@ Column { } Label { text: qsTr("msaaSamples") - toolTip: qsTr("MSAA Sample Count") + tooltip: qsTr("MSAA Sample Count") Layout.fillWidth: true } SpinBox { @@ -121,7 +121,7 @@ Column { } Label { text: qsTr("shadowQuality") - toolTip: qsTr("Shadow Quality") + tooltip: qsTr("Shadow Quality") Layout.fillWidth: true } SecondColumnLayout { @@ -136,7 +136,7 @@ Column { } Label { text: qsTr("selectionMode") - toolTip: qsTr("Selection Mode") + tooltip: qsTr("Selection Mode") Layout.fillWidth: true } SecondColumnLayout { @@ -268,7 +268,7 @@ Column { } Label { text: qsTr("measureFps") - toolTip: qsTr("Measure Frames Per Second") + tooltip: qsTr("Measure Frames Per Second") Layout.fillWidth: true } SecondColumnLayout { @@ -279,7 +279,7 @@ Column { } Label { text: qsTr("orthoProjection") - toolTip: qsTr("Use Orthographic Projection") + tooltip: qsTr("Use Orthographic Projection") Layout.fillWidth: true } SecondColumnLayout { @@ -290,7 +290,7 @@ Column { } Label { text: qsTr("aspectRatio") - toolTip: qsTr("Aspect Ratio") + tooltip: qsTr("Aspect Ratio") Layout.fillWidth: true } SecondColumnLayout { @@ -305,7 +305,7 @@ Column { } Label { text: qsTr("floorLevel") - toolTip: qsTr("Floor Level") + tooltip: qsTr("Floor Level") Layout.fillWidth: true } SecondColumnLayout { @@ -317,7 +317,7 @@ Column { } Label { text: qsTr("horizontalAspectRatio") - toolTip: qsTr("Horizontal Aspect Ratio") + tooltip: qsTr("Horizontal Aspect Ratio") Layout.fillWidth: true } SecondColumnLayout { @@ -332,7 +332,7 @@ Column { } Label { text: qsTr("reflection") - toolTip: qsTr("Reflection") + tooltip: qsTr("Reflection") Layout.fillWidth: true } SecondColumnLayout { @@ -344,7 +344,7 @@ Column { } Label { text: qsTr("reflectivity") - toolTip: qsTr("Reflectivity") + tooltip: qsTr("Reflectivity") Layout.fillWidth: true visible: reflectionCheckbox.checked } @@ -361,7 +361,7 @@ Column { } Label { text: qsTr("margin") - toolTip: qsTr("Graph Margin") + tooltip: qsTr("Graph Margin") Layout.fillWidth: true } SecondColumnLayout { diff --git a/src/datavisualizationqml2/designer/Scatter3DSpecifics.qml b/src/datavisualizationqml2/designer/Scatter3DSpecifics.qml index 841ef012..9fce717e 100644 --- a/src/datavisualizationqml2/designer/Scatter3DSpecifics.qml +++ b/src/datavisualizationqml2/designer/Scatter3DSpecifics.qml @@ -32,7 +32,7 @@ Column { SectionLayout { Label { text: qsTr("renderingMode") - toolTip: qsTr("Rendering Mode") + tooltip: qsTr("Rendering Mode") Layout.fillWidth: true } SecondColumnLayout { @@ -46,7 +46,7 @@ Column { } Label { text: qsTr("msaaSamples") - toolTip: qsTr("MSAA Sample Count") + tooltip: qsTr("MSAA Sample Count") Layout.fillWidth: true } SpinBox { @@ -58,7 +58,7 @@ Column { } Label { text: qsTr("shadowQuality") - toolTip: qsTr("Shadow Quality") + tooltip: qsTr("Shadow Quality") Layout.fillWidth: true } SecondColumnLayout { @@ -73,7 +73,7 @@ Column { } Label { text: qsTr("selectionMode") - toolTip: qsTr("Selection Mode") + tooltip: qsTr("Selection Mode") Layout.fillWidth: true } SecondColumnLayout { @@ -86,7 +86,7 @@ Column { } Label { text: qsTr("measureFps") - toolTip: qsTr("Measure Frames Per Second") + tooltip: qsTr("Measure Frames Per Second") Layout.fillWidth: true } SecondColumnLayout { @@ -97,7 +97,7 @@ Column { } Label { text: qsTr("orthoProjection") - toolTip: qsTr("Use Orthographic Projection") + tooltip: qsTr("Use Orthographic Projection") Layout.fillWidth: true } SecondColumnLayout { @@ -108,7 +108,7 @@ Column { } Label { text: qsTr("aspectRatio") - toolTip: qsTr("Horizontal to Vertical Aspect Ratio") + tooltip: qsTr("Horizontal to Vertical Aspect Ratio") Layout.fillWidth: true } SecondColumnLayout { @@ -123,7 +123,7 @@ Column { } Label { text: qsTr("optimizationHints") - toolTip: qsTr("Optimization Hints") + tooltip: qsTr("Optimization Hints") Layout.fillWidth: true } SecondColumnLayout { @@ -136,7 +136,7 @@ Column { } Label { text: qsTr("polar") - toolTip: qsTr("Use Polar Coordinates") + tooltip: qsTr("Use Polar Coordinates") Layout.fillWidth: true } SecondColumnLayout { @@ -148,7 +148,7 @@ Column { } Label { text: qsTr("radialLabelOffset") - toolTip: qsTr("Radial Label Offset") + tooltip: qsTr("Radial Label Offset") Layout.fillWidth: true visible: polarCheckbox.checked } @@ -165,7 +165,7 @@ Column { } Label { text: qsTr("horizontalAspectRatio") - toolTip: qsTr("Horizontal Aspect Ratio") + tooltip: qsTr("Horizontal Aspect Ratio") Layout.fillWidth: true } SecondColumnLayout { @@ -180,7 +180,7 @@ Column { } Label { text: qsTr("margin") - toolTip: qsTr("Graph Margin") + tooltip: qsTr("Graph Margin") Layout.fillWidth: true } SecondColumnLayout { diff --git a/src/datavisualizationqml2/designer/Surface3DSpecifics.qml b/src/datavisualizationqml2/designer/Surface3DSpecifics.qml index 03a2f02c..7047d72a 100644 --- a/src/datavisualizationqml2/designer/Surface3DSpecifics.qml +++ b/src/datavisualizationqml2/designer/Surface3DSpecifics.qml @@ -33,7 +33,7 @@ Column { SectionLayout { Label { text: qsTr("renderingMode") - toolTip: qsTr("Rendering Mode") + tooltip: qsTr("Rendering Mode") Layout.fillWidth: true } SecondColumnLayout { @@ -47,7 +47,7 @@ Column { } Label { text: qsTr("msaaSamples") - toolTip: qsTr("MSAA Sample Count") + tooltip: qsTr("MSAA Sample Count") Layout.fillWidth: true } SpinBox { @@ -59,7 +59,7 @@ Column { } Label { text: qsTr("shadowQuality") - toolTip: qsTr("Shadow Quality") + tooltip: qsTr("Shadow Quality") Layout.fillWidth: true } SecondColumnLayout { @@ -74,7 +74,7 @@ Column { } Label { text: qsTr("selectionMode") - toolTip: qsTr("Selection Mode") + tooltip: qsTr("Selection Mode") Layout.fillWidth: true } SecondColumnLayout { @@ -206,7 +206,7 @@ Column { } Label { text: qsTr("measureFps") - toolTip: qsTr("Measure Frames Per Second") + tooltip: qsTr("Measure Frames Per Second") Layout.fillWidth: true } SecondColumnLayout { @@ -217,7 +217,7 @@ Column { } Label { text: qsTr("orthoProjection") - toolTip: qsTr("Use Orthographic Projection") + tooltip: qsTr("Use Orthographic Projection") Layout.fillWidth: true } SecondColumnLayout { @@ -228,7 +228,7 @@ Column { } Label { text: qsTr("aspectRatio") - toolTip: qsTr("Horizontal to Vertical Aspect Ratio") + tooltip: qsTr("Horizontal to Vertical Aspect Ratio") Layout.fillWidth: true } SecondColumnLayout { @@ -243,7 +243,7 @@ Column { } Label { text: qsTr("flipHorizontalGrid") - toolTip: qsTr("Flip Horizontal Grid") + tooltip: qsTr("Flip Horizontal Grid") Layout.fillWidth: true } SecondColumnLayout { @@ -254,7 +254,7 @@ Column { } Label { text: qsTr("polar") - toolTip: qsTr("Use Polar Coordinates") + tooltip: qsTr("Use Polar Coordinates") Layout.fillWidth: true } SecondColumnLayout { @@ -266,7 +266,7 @@ Column { } Label { text: qsTr("radialLabelOffset") - toolTip: qsTr("Radial Label Offset") + tooltip: qsTr("Radial Label Offset") Layout.fillWidth: true visible: polarCheckbox.checked } @@ -283,7 +283,7 @@ Column { } Label { text: qsTr("horizontalAspectRatio") - toolTip: qsTr("Horizontal Aspect Ratio") + tooltip: qsTr("Horizontal Aspect Ratio") Layout.fillWidth: true } SecondColumnLayout { @@ -298,7 +298,7 @@ Column { } Label { text: qsTr("margin") - toolTip: qsTr("Graph Margin") + tooltip: qsTr("Graph Margin") Layout.fillWidth: true } SecondColumnLayout { -- cgit v1.2.3 From dfcc8c6d756f9a194cfcdc0eb1eb47af8c1a4bb2 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Fri, 14 Nov 2014 14:52:25 +0200 Subject: Fix the required creator version Change-Id: I14c8a065bf89b471c31f1cdad2550f35e02ef233 Reviewed-by: Miikka Heikkinen --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index 96099dbe..8719f940 100644 --- a/README +++ b/README @@ -11,7 +11,7 @@ System Requirements - Qt 5.2.1 or newer - OpenGL 2.1 or newer (recommended) or OpenGL ES2 (reduced feature set) - Manipulating Qt Data Visualization graphs with QML Designer requires - Qt Creator 3.1 or newer + Qt Creator 3.3 or newer Building ======== -- cgit v1.2.3