summaryrefslogtreecommitdiffstats
path: root/examples/widgets/painting
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-07-15 10:36:58 +0200
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2013-07-15 10:36:59 +0200
commit1190863fc0855ef25e7239e35da3978f317638bd (patch)
tree92c408f7c53f194639d2a10b82f5c90a85704776 /examples/widgets/painting
parent02afd94ef4c1913735bd650ca93279cfb00dc534 (diff)
parente4484bb15b29b01dba07cbc31c150153f537606a (diff)
Merge remote-tracking branch 'origin/stable' into dev
Diffstat (limited to 'examples/widgets/painting')
-rw-r--r--examples/widgets/painting/basicdrawing/renderarea.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/widgets/painting/basicdrawing/renderarea.cpp b/examples/widgets/painting/basicdrawing/renderarea.cpp
index 0519ceee3a..e3e6771b4f 100644
--- a/examples/widgets/painting/basicdrawing/renderarea.cpp
+++ b/examples/widgets/painting/basicdrawing/renderarea.cpp
@@ -189,7 +189,7 @@ void RenderArea::paintEvent(QPaintEvent * /* event */)
painter.drawPath(path);
break;
case Text:
- painter.drawText(rect, Qt::AlignCenter, tr("Qt by\nNokia"));
+ painter.drawText(rect, Qt::AlignCenter, tr("Qt by\nDigia"));
break;
case Pixmap:
painter.drawPixmap(10, 10, pixmap);