diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-09-29 14:07:02 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-09-29 14:08:49 +0200 |
| commit | 189dc655bbb3b4f9e1e11596f5a0f4682326066d (patch) | |
| tree | 67527f791542775394332c2995887994bde9adc9 /doc/global/externalsites/qtcreator.qdoc | |
| parent | 6fd5870df0fbad0187b6d8bf7e3b12afb2e7a66f (diff) | |
| parent | dfe853bff90444edf92a993e391df853780c9e8d (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/corelib/tools/qbytearray.cpp
src/gui/image/qimage.cpp
src/gui/image/qppmhandler.cpp
src/gui/kernel/qguiapplication.cpp
src/gui/painting/qpaintengine_raster.cpp
Change-Id: I7c1a8e7ebdfd7f7ae767fdb932823498a7660765
Diffstat (limited to 'doc/global/externalsites/qtcreator.qdoc')
| -rw-r--r-- | doc/global/externalsites/qtcreator.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/global/externalsites/qtcreator.qdoc b/doc/global/externalsites/qtcreator.qdoc index 30e65034fc..46609de160 100644 --- a/doc/global/externalsites/qtcreator.qdoc +++ b/doc/global/externalsites/qtcreator.qdoc @@ -50,7 +50,7 @@ \title Qt Creator: Connecting Embedded Linux Devices */ /*! - \externalpage http://qt-project.org/doc/qtcreator/creator-deployment-maemo.html + \externalpage http://qt-project.org/doc/qtcreator/creator-deployment-embedded-linux.html \title Qt Creator: Deploying Applications to Embedded Linux Devices */ /*! |