diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-15 10:36:58 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-15 10:36:59 +0200 |
commit | 1190863fc0855ef25e7239e35da3978f317638bd (patch) | |
tree | 92c408f7c53f194639d2a10b82f5c90a85704776 /examples | |
parent | 02afd94ef4c1913735bd650ca93279cfb00dc534 (diff) | |
parent | e4484bb15b29b01dba07cbc31c150153f537606a (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I0218a1f08b89f2d56757ab35eec06799d2a1492f
Diffstat (limited to 'examples')
-rw-r--r-- | examples/embedded/lightmaps/slippymap.cpp | 2 | ||||
-rw-r--r-- | examples/embedded/styleexample/main.cpp | 4 | ||||
-rw-r--r-- | examples/widgets/painting/basicdrawing/renderarea.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/examples/embedded/lightmaps/slippymap.cpp b/examples/embedded/lightmaps/slippymap.cpp index 9861618dba..7355e336c7 100644 --- a/examples/embedded/lightmaps/slippymap.cpp +++ b/examples/embedded/lightmaps/slippymap.cpp @@ -198,7 +198,7 @@ void SlippyMap::download() m_url = QUrl(path.arg(zoom).arg(grab.x()).arg(grab.y())); QNetworkRequest request; request.setUrl(m_url); - request.setRawHeader("User-Agent", "Nokia (Qt) Graphics Dojo 1.0"); + request.setRawHeader("User-Agent", "Digia (Qt) Graphics Dojo 1.0"); request.setAttribute(QNetworkRequest::User, QVariant(grab)); m_manager.get(request); } diff --git a/examples/embedded/styleexample/main.cpp b/examples/embedded/styleexample/main.cpp index 833dbadd49..6630682fe4 100644 --- a/examples/embedded/styleexample/main.cpp +++ b/examples/embedded/styleexample/main.cpp @@ -48,8 +48,8 @@ int main(int argc, char *argv[]) Q_INIT_RESOURCE(styleexample); app.setApplicationName("style"); - app.setOrganizationName("Nokia"); - app.setOrganizationDomain("com.nokia.qt"); + app.setOrganizationName("QtProject"); + app.setOrganizationDomain("www.qt-project.org"); StyleWidget widget; widget.showFullScreen(); 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); |