Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I277bc833edb7eec513da3ca21490b930fec4e7d1

17 files changed, 121 insertions, 242 deletions

diff --git a/dist/changes-5.0.1 b/dist/changes-5.0.1
index 29176103..69f17b33 100644
--- a/dist/changes-5.0.1
+++ b/dist/changes-5.0.1
@@ -22,25 +22,4 @@ information about a particular change.
 General Improvements
 --------------------
 
-Third party components
-----------------------
-
-****************************************************************************
-*                      Platform Specific Changes                           *
-****************************************************************************
-
-
-****************************************************************************
-*                      Compiler Specific Changes                           *
-****************************************************************************
-
-
-****************************************************************************
-*                          Tools                                           *
-****************************************************************************
-
-
-****************************************************************************
-*                          Plugins                                         *
-****************************************************************************
-
+ - Documentation: Fixed several missing information or incorrect information
diff --git a/doc/config/online/template/style/narrow.css b/doc/config/online/template/style/narrow.css
index 39b47400..ba98b3fe 100644
--- a/doc/config/online/template/style/narrow.css
+++ b/doc/config/online/template/style/narrow.css
@@ -188,7 +188,7 @@
     }
 
     .narrow #narrowsearch {
-      background: url("http://doc.qt.nokia.com/prototype/html/images/sprites-combined.png") no-repeat scroll -6px -348px transparent;
+      background: url("https://qt-project.org/images/qtdn/sprites-combined-latest.png") no-repeat scroll -6px -348px transparent;
       height: 21px;
       padding: 2px 0 0 5px;
       width: 167px;
diff --git a/doc/config/qmake.qdocconf b/doc/config/qmake.qdocconf
index 4f0f8916..f6d8dd38 100644
--- a/doc/config/qmake.qdocconf
+++ b/doc/config/qmake.qdocconf
@@ -13,7 +13,7 @@ indexes                 = $QT_BUILD_TREE/doc-build/html-qt/qt.index
 qhp.projects            = qmake
 
 qhp.qmake.file                = qmake.qhp
-qhp.qmake.namespace           = org.qt-project.qmake.500
+qhp.qmake.namespace           = org.qt-project.qmake.501
 qhp.qmake.virtualFolder       = qmake
 qhp.qmake.indexTitle          = QMake Manual
 qhp.qmake.extraFiles          = images/bg_l.png \
diff --git a/doc/config/qtdoc-qhp.qdocconf b/doc/config/qtdoc-qhp.qdocconf
index 6b9ccdc7..2021810d 100644
--- a/doc/config/qtdoc-qhp.qdocconf
+++ b/doc/config/qtdoc-qhp.qdocconf
@@ -1,7 +1,7 @@
 qhp.projects            = QtDoc
 
 qhp.QtDoc.file                = qtdoc.qhp
-qhp.QtDoc.namespace           = org.qt-project.qtdoc.500
+qhp.QtDoc.namespace           = org.qt-project.qtdoc.501
 qhp.QtDoc.virtualFolder       = qtdoc
 qhp.QtDoc.indexTitle          = Qt 5.0 Reference Documentation
 qhp.QtDoc.indexRoot           =
@@ -16,7 +16,7 @@ qhp.QtDoc.subprojects.classes.selectors = class fake:headerfile
 qhp.QtDoc.subprojects.classes.sortPages = true
 qhp.QtDoc.subprojects.qmltypes.title = QML Types
 qhp.QtDoc.subprojects.qmltypes.indexTitle = All QML APIs by Module
-qhp.QtDoc.subprojects.qmltypes.selectors = class fake:headerfile
+qhp.QtDoc.subprojects.qmltypes.selectors = fake:headerfile
 qhp.QtDoc.subprojects.qmltypes.sortPages = true
 qhp.QtDoc.subprojects.examples.title = Tutorials and Examples
 qhp.QtDoc.subprojects.examples.indexTitle = Qt Examples And Tutorials
diff --git a/doc/src/deployment/deployment.qdoc b/doc/src/deployment/deployment.qdoc
index c105cba1..64192111 100644
--- a/doc/src/deployment/deployment.qdoc
+++ b/doc/src/deployment/deployment.qdoc
@@ -393,11 +393,17 @@
         \li The ExtraFilters plugin
         \li {2, 1} \c plugins\libpnp_extrafilters.so
     \row
+        \li The Qt xcb platform plugin
+        \li {2, 1} \c platforms\libqxcb.so
+    \row
         \li The Qt Core module
-        \li {2, 1} \c libQtCore.so.4
+        \li {2, 1} \c libQt5Core.so.5
     \row
         \li The Qt GUI module
-        \li {2, 1} \c libQtGui.so.4
+        \li {2, 1} \c libQt5Gui.so.5
+    \row
+        \li The Qt Widgets module
+        \li {2, 1} \c libQt5Widgets.so.5
     \endtable
 
     On most systems, the extension for shared libraries is \c .so. A
@@ -536,11 +542,8 @@
 
     \snippet doc/src/snippets/code/doc_src_deployment.qdoc 12
 
-    This will build Qt statically. Note that unlike with a dynamic build,
-    building Qt statically will result in libraries without version numbers;
-    e.g. \c QtCore5.lib will be \c QtCore.lib. Also, we have used \c nmake
-    in all the examples, but if you use MinGW you must use
-    \c mingw32-make instead.
+    This will build Qt statically. Note that we have used \c nmake
+    in all the examples, but \c mingw32-make should be used for MinGW.
 
     \note If you later need to reconfigure and rebuild Qt from the
     same location, ensure that all traces of the previous configuration are
@@ -697,16 +700,16 @@
         \li {2, 1} \c plugins\pnp_extrafilters.dll
     \row
         \li The Qt Windows platform plugin
-        \li {2, 1} \c platforms\windows.dll
+        \li {2, 1} \c platforms\qwindows.dll
     \row
         \li The Qt Core module
-        \li {2, 1} \c qtcore5.dll
+        \li {2, 1} \c Qt5Core.dll
     \row
         \li The Qt GUI module
-        \li {2, 1} \c qtgui5.dll
+        \li {2, 1} \c Qt5Gui.dll
     \row
         \li The Qt Widgets module
-        \li {2, 1} \c qtwidgets5.dll
+        \li {2, 1} \c Qt5Widgets.dll
     \endtable
 
     In addition, the archive must contain the following compiler
@@ -883,9 +886,9 @@
             \li MinGW
         \row
         \li \list
-               \li QTCORE5.DLL - The QtCore runtime
-               \li QTGUI5.DLL - The QtGui runtime
-               \li QTWIDGETS5.DLL - The QtWidgets runtime
+               \li QT5CORE.DLL - The QtCore runtime
+               \li QT5GUI.DLL - The QtGui runtime
+               \li QT5WIDGETS.DLL - The QtWidgets runtime
            \endlist
         \li \list
                \li MSVCR80.DLL - The C runtime
diff --git a/doc/src/frameworks-technologies/desktop-integration.qdoc b/doc/src/frameworks-technologies/desktop-integration.qdoc
index 7123d471..f63e907b 100644
--- a/doc/src/frameworks-technologies/desktop-integration.qdoc
+++ b/doc/src/frameworks-technologies/desktop-integration.qdoc
@@ -46,15 +46,6 @@
 
     \annotatedlist desktop
 
-    \section1 Setting the Application Icon
-
-    In order to change the icon of the executable application file
-    itself, as it is presented on the desktop (i.e., prior to
-    application execution), it is necessary to employ another,
-    platform-dependent technique.
-
-    \tableofcontents {1 Setting the Application Icon}
-
     \section1 Opening External Resources
 
     Although Qt provides facilities to handle and display resources, such as
diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index 510d06e1..b3fde231 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -35,8 +35,6 @@ information on how to install Qt, as well as software and hardware requirements
 for using Qt on each of the supported platforms. Please follow the instructions
 for your platform from the following list.
 
-\generatelist{related}
-
 */
 
 /*! \page install-x11.html
@@ -636,9 +634,10 @@ in the \l{Qt for Windows CE Requirements} document.
                 \li Install Visual C++ 2010 SP1 Compiler Update for the Windows SDK 7.1
             \endlist
         \li Windows SDK 7.
-        \li MinGW \l{mingw.org}, TDM MinGW \l{tdm-gcc.tdragon.net}, or MinGW-builds
-            \l{http://sourceforge.net/projects/mingwbuilds/} with g++ version 4.7 or higher
-            (not supported for all modules).
+        \li A MinGW toolchain with g++ version 4.7 or higher. Qt 5 is tested regularly with a \
+            \l{http://sourceforge.net/projects/mingwbuilds/files/host-windows/releases/4.7.2/32-bit/threads-posix/sjlj/x32-4.7.2-release-posix-sjlj-rev8.7z}
+            {32 bit gcc 4.7.2 toolchain} from the \l{http://mingwbuilds.sourceforge.net}{MinGW-builds}
+            project.
 
     \endlist
 
diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc
index 76213d28..1248ee47 100644
--- a/doc/src/modules.qdoc
+++ b/doc/src/modules.qdoc
@@ -218,28 +218,6 @@
 */
 
 /*!
-  \module QtScriptTools
-  \title QtScriptTools Module
-  \since 4.5
-  \ingroup modules
-
-  \brief The QtScriptTools module provides additional components for applications that use Qt Script.
-
-  \section1 Configuring the Build Process
-
-  Applications that use the Qt Script Tools classes need to
-  be configured to be built against the QtScriptTools module.
-  To include the definitions of the module's classes, use the
-  following directive:
-
-  \snippet doc/src/snippets/code/doc_src_qtscripttools.cpp 0
-
-  To link against the module, add this line to your \l qmake \c .pro file:
-
-  \snippet doc/src/snippets/code/doc_src_qtscripttools.pro 1
-*/
-
-/*!
     \page qtmain.html
     \title The qtmain Library
     \ingroup licensing
diff --git a/doc/src/platforms/platform-notes-rtos.qdoc b/doc/src/platforms/platform-notes-rtos.qdoc
index 6896c191..f6f000be 100644
--- a/doc/src/platforms/platform-notes-rtos.qdoc
+++ b/doc/src/platforms/platform-notes-rtos.qdoc
@@ -44,9 +44,89 @@
     \contentspage Platform and Compiler Notes
     \target QNX
 
-    \note QNX is a community supported platform. See the
-    \l{Supported Platforms} page for more information.
+    \note QNX is a community supported platform.
 
+    \section1 Supported Architectures and QNX Versions
+
+    Qt 5 is currently tested and supported on QNX 6.5.0 SP1 supplemented by the new QNX UI Core
+    graphics framework (Screen). Supported architectures are ARMle-v7 and x86. Other QNX versions and
+    architectures may also work, but are not subject to regular builds and testing. For a
+    specific list of available boards, displays and input devices, contact QNX Software Systems
+    (info@qnx.com) or KDAB (qnx-info@kdab.com).
+
+    \section1 Build Requirements
+
+    Building Qt 5 requires \l {http://www.qnx.com/download/group.html?programid=20905}{QNX SDP 6.5.0 SP1} from the \l {http://www.qnx.com/}{QNX website} and the new QNX UI Core
+    graphics framework (contact QNX for access).
+
+    Supported compiler is qcc for both ARMle-v7 (QMakespec qnx-armv7le-qcc)
+    and x86 (qnx-x86-qcc).
+
+    When building qtbase, recommended configure flags include:
+
+    \code
+    -opengl es2 -egl -no-cups -no-xcb -no-eglfs -no-javascript-jit -no-gtkstyle -no-iconv
+    \endcode
+
+    \section2 Screen and OpenGL
+
+    As noted above, building Qt 5 requires the QNX 6.5.0 SP1 and the new UI Core graphics
+    framework headers and libraries. Both are available through QNX. For OpenGL support
+    (GL widgets and QML2), OpenGL ES2 or higher must be available.
+
+    \section1 Runtime Requirements
+
+    On the QNX target device, certain requirements must be met at runtime
+    to ensure Qt functions correctly.
+
+    \section2 UI Core (QNX Screen)
+
+    Before starting any Qt application, QNX Screen, the UI framework driver, must be started. To ensure QNX Screen is
+    configured correctly, verify that applications like gles2-gears can be started and run without problems.
+
+    \section2 IPv6 Support
+
+    Qt's networking stack, \l{Qt Network}, requires IPv6 support to be enabled, independent of
+    whether the actual networking uses IPv4 or IPv6. That means, that io-pkt-v6-hc must be running, \e {not} io-pkt-v4.
+
+    \section2 /dev/random
+
+    Qt requires \c{/dev/random} to be present and functional. Thus, start \c random before starting any Qt application:
+
+    \code
+    random -t
+    \endcode
+
+    \section2 Physical Screen Size
+
+    Qt needs information about the physical dimensions of the attached display to determine DPI
+    information and thus correct font sizes. This information is provided by Screen.
+    In some cases you may see an invalid screen size such as 0mmx0mm.
+    In such a case Qt requires an environment variable \c QQNX_PHYSICAL_SCREEN_SIZE to get the required information.
+    If Qt applications exits with an error message saying that the physical screen size couldn't be determined,
+    set the variable like this before starting the Qt application:
+
+    \code
+    export QQNX_PHYSICAL_SCREEN_SIZE=150,100
+    \endcode
+
+    to inform Qt that the screen has a width of 150mm and a height of 100mm.
+    (Note that the physical screen size is measured in millimeters (mm))
+
+    \section1 Development Board Setup
+
+    To develop for QNX with Qt Creator, the development board needs the following setup:
+
+    \section2 ssh
+
+    For deploying and running a binary remotely on the development board with Qt Creator,
+    ssh must be installed and running. ssh in turn also requires \c{/dev/random}.
+
+    \section2 pdebug
+
+    For remote debugging to work, pdebug must be running on the development device. See
+    the QNX documentation included with the QNX Momentics development tool suite for
+    more details pertaining to pdebug and other QNX development tools.
 */
 
 /*!
diff --git a/doc/src/platforms/platform-notes.qdoc b/doc/src/platforms/platform-notes.qdoc
index 07bd2ebe..f82a8064 100644
--- a/doc/src/platforms/platform-notes.qdoc
+++ b/doc/src/platforms/platform-notes.qdoc
@@ -76,7 +76,7 @@
     \li Apple clang 3.1 (Mac OS X / XCode 4)
     \li gcc 4.5 and newer (Linux)
     \li MSVC 2008 and newer
-    \li MingW 4.6
+    \li MinGW-builds GCC 4.7.2
     \li Intel CC (latest version)
     \endlist
 
@@ -181,11 +181,13 @@
     rendering is enabled. Other GL-applications may not work as expected,
     unless direct rendering is disabled.
 
-    \section2 GCC (MinGW)
+    \section2 GCC (MinGW-builds)
 
-    We have tested Qt with this compiler on Windows XP.
-    The minimal version of MinGW
-    supported is GCC 4.6. For 64 bit builds, \l{TDM-GCC} can be used.
+    We have tested Qt with this compiler on Windows 7.
+    The minimum version of MinGW-builds supported is GCC 4.7.2.
+    \l{http://sourceforge.net/projects/mingwbuilds/files/host-windows/releases/4.7.2/32-bit/threads-posix/sjlj/x32-4.7.2-release-posix-sjlj-rev8.7z}
+    {MinGW-builds GCC 4.7.2 32 bit, rev 8} and later should be able
+    to build Qt including QtWebKit.
 
     \section2 Intel C++ Compiler (Windows, Altix)
 
diff --git a/doc/src/platforms/supported-platforms.qdoc b/doc/src/platforms/supported-platforms.qdoc
index c2ea05da..3a09aee0 100644
--- a/doc/src/platforms/supported-platforms.qdoc
+++ b/doc/src/platforms/supported-platforms.qdoc
@@ -223,7 +223,7 @@
         a wide range of Mac platform variants.
         \li \l{Qt for Mac OS X Requirements}{Qt for Mac OS X Requirements}
         - Software required to run Qt on Mac OS X.
-        \li \l{Installing Qt for X11 Platforms}{Installing Qt for X11 Platforms}
+        \li \l{Installing Qt for Mac OS X}{Installing Qt for Mac OS X}
         - Build Qt for Mac OS X development.
         \li \l{Platform and Compiler Notes - Mac OS X}{Platform and Compiler Notes - Mac OS X}
         - Platform specific notes.
@@ -312,7 +312,7 @@
     \list
         \li Embedded Linux (DirectFB, EGLFS, KMS, and Wayland)
         \li Windows Embedded (Compact and Standard)
-        \li Real-Time Operating Systems, such as QNX, VxWorks and INTEGRITY
+        \li Real-Time Operating Systems, such as \l{QNX}, VxWorks and INTEGRITY
     \endlist
 
     \section1 Mobile platforms
@@ -340,7 +340,7 @@
     \row    \li Microsoft Windows 7 (32-bit)
                                      \li MSVC 2010 SP1
     \row    \li Microsoft Windows 7 (32-bit)
-                                     \li MinGW 4.7
+                                     \li \l{http://sourceforge.net/projects/mingwbuilds/files/host-windows/releases/4.7.2/32-bit/threads-posix/sjlj/x32-4.7.2-release-posix-sjlj-rev8.7z}{MinGW-builds gcc 4.7.2 (32-bit)}
     \row    \li Microsoft Windows 8 (64-bit)
                                      \li MSVC 2012
     \row    \li Apple Mac OS X 10.7 "Lion", Cocoa (64-bit)
diff --git a/doc/src/snippets/code/doc_src_qtscripttools.cpp b/doc/src/snippets/code/doc_src_qtscripttools.cpp
deleted file mode 100644
index d385f696..00000000
--- a/doc/src/snippets/code/doc_src_qtscripttools.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//! [0]
-#include <QtScriptTools>
-//! [0]
diff --git a/doc/src/snippets/code/doc_src_qtscripttools.pro b/doc/src/snippets/code/doc_src_qtscripttools.pro
deleted file mode 100644
index 6680f5f3..00000000
--- a/doc/src/snippets/code/doc_src_qtscripttools.pro
+++ /dev/null
@@ -1,43 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#! [1]
-QT += scripttools
-#! [1]
diff --git a/doc/src/snippets/code/doc_src_symbian-introduction.qdoc b/doc/src/snippets/code/doc_src_symbian-introduction.qdoc
deleted file mode 100644
index 6ab2a50b..00000000
--- a/doc/src/snippets/code/doc_src_symbian-introduction.qdoc
+++ /dev/null
@@ -1,67 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//! [0]
-    qmake
-//! [0]
-
-
-//! [1]
-    make debug-winscw
-//! [1]
-
-//! [2]
-    qmake
-    make debug-winscw release-armv5
-    make sis
-//! [2]
-
-//! [3]
-   make sis QT_SIS_TARGET=debug-armv5
-//! [3]
-
-//! [4]
-   set QT_SIS_TARGET=debug-armv5
-   make sis
-//! [4]
-
-//! [5]
-   make deploy
-//! [5]
diff --git a/doc/src/snippets/declarative/qml-extending-types/properties/alias/application.qml b/doc/src/snippets/declarative/qml-extending-types/properties/alias/application.qml
index f0afe54a..94ae6a1a 100644
--- a/doc/src/snippets/declarative/qml-extending-types/properties/alias/application.qml
+++ b/doc/src/snippets/declarative/qml-extending-types/properties/alias/application.qml
@@ -44,7 +44,7 @@ import QtQuick 1.0
 ImageViewer {
     id: viewer
 
-    currentImage.source: "http://qt.nokia.com/logo.png"
+    currentImage.source: "http://qt-project.org/images/qtdn/doc/qt-logo.png"
     currentImage.width: width
     currentImage.height: height
     currentImage.fillMode: Image.Tile
diff --git a/doc/src/snippets/declarative/qml-extending-types/properties/application.qml b/doc/src/snippets/declarative/qml-extending-types/properties/application.qml
index 8799d54b..cca9a4d7 100644
--- a/doc/src/snippets/declarative/qml-extending-types/properties/application.qml
+++ b/doc/src/snippets/declarative/qml-extending-types/properties/application.qml
@@ -43,7 +43,7 @@ import QtQuick 1.0
 ImageViewer {
     id: viewer
 
-    currentImage: "http://qt.nokia.com/logo.png"
+    currentImage: "http://qt-project.org/images/qtdn/doc/qt-logo.png"
 
     Text { text: viewer.currentImage }
 }
diff --git a/doc/src/snippets/qmake/comments.pro b/doc/src/snippets/qmake/comments.pro
index 390444b9..957052c8 100644
--- a/doc/src/snippets/qmake/comments.pro
+++ b/doc/src/snippets/qmake/comments.pro
@@ -5,6 +5,6 @@
 
 #! [1]
 # To include a literal hash character, use the $$LITERAL_HASH variable:
-urlPieces = http://qt.nokia.com/doc/4.0/qtextdocument.html pageCount
+urlPieces = http://qt-project.org/doc/qt-5.0/qtgui/qtextdocument.html pageCount
 message($$join(urlPieces, $$LITERAL_HASH))
 #! [1]