summaryrefslogtreecommitdiffstats
path: root/examples/painting
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2012-06-12 13:08:43 +0200
committerQt by Nokia <qt-info@nokia.com>2012-06-14 05:26:45 +0200
commit5f5555f4d3c9a507bfc8fad9a008431257bd1ab3 (patch)
tree000c7beb1230abf0bf85fa18ba6a90856a32b51a /examples/painting
parentdd9bdf5654a02c8bcafd7b26ceb652bd737d9cd5 (diff)
Fix encoding of non-ASCII strings
tr() only takes UTF-8 as input, so we must recode to UTF-8. But we can use QLatin1String elsewhere. Task-number: QTBUG-26086 Change-Id: I5932ddc96fb817dbe01106e5f6f2b10f58472d6b Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Diffstat (limited to 'examples/painting')
-rw-r--r--examples/painting/painterpaths/window.cpp2
-rw-r--r--examples/painting/transformations/window.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/painting/painterpaths/window.cpp b/examples/painting/painterpaths/window.cpp
index 65139fe5d1..3d3eef9d2b 100644
--- a/examples/painting/painterpaths/window.cpp
+++ b/examples/painting/painterpaths/window.cpp
@@ -184,7 +184,7 @@ Window::Window()
rotationAngleSpinBox = new QSpinBox;
rotationAngleSpinBox->setRange(0, 359);
rotationAngleSpinBox->setWrapping(true);
- rotationAngleSpinBox->setSuffix("\xB0");
+ rotationAngleSpinBox->setSuffix(QLatin1String("\xB0"));
rotationAngleLabel = new QLabel(tr("&Rotation Angle:"));
rotationAngleLabel->setBuddy(rotationAngleSpinBox);
diff --git a/examples/painting/transformations/window.cpp b/examples/painting/transformations/window.cpp
index 76b7597c6c..5f9296be7f 100644
--- a/examples/painting/transformations/window.cpp
+++ b/examples/painting/transformations/window.cpp
@@ -64,7 +64,7 @@ Window::Window()
operationComboBoxes[i] = new QComboBox;
operationComboBoxes[i]->addItem(tr("No transformation"));
- operationComboBoxes[i]->addItem(tr("Rotate by 60\xB0"));
+ operationComboBoxes[i]->addItem(tr("Rotate by 60\xC2\xB0"));
operationComboBoxes[i]->addItem(tr("Scale to 75%"));
operationComboBoxes[i]->addItem(tr("Translate by (50, 50)"));