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

Change-Id: Iaa321deb9e536ce89b87a337b57634f00c770a32

8 files changed, 17 insertions, 10 deletions

diff --git a/dist/changes-5.0.1 b/dist/changes-5.0.1
index e73776185d..bf5df25b53 100644
--- a/dist/changes-5.0.1
+++ b/dist/changes-5.0.1
@@ -22,6 +22,13 @@ information about a particular change.
 General Improvements
 --------------------
 
+ - Documentation:
+   - Moved documentation under the correct module, fixed module identifiers
+   - Cleanup of examples and their documentation
+   - [QTBUG-28579] Fixed broken links to C++ class reference and examples
+     for a number of modules in Qt Creator Help contents
+   - Fixed incorrect or missing links, typos
+
 Third party components
 ----------------------
 
diff --git a/doc/global/qt-html-templates-offline.qdocconf b/doc/global/qt-html-templates-offline.qdocconf
index 5f989d2fa8..e9b2c6a7a8 100644
--- a/doc/global/qt-html-templates-offline.qdocconf
+++ b/doc/global/qt-html-templates-offline.qdocconf
@@ -39,7 +39,7 @@ HTML.footer = \
     "</div>\n" \
     "<div class=\"footer\">\n" \
     "    <p>\n" \
-    "      <acronym title=\"Copyright\">&copy;</acronym> 2012 Digia Plc and/or its\n" \
+    "      <acronym title=\"Copyright\">&copy;</acronym> 2013 Digia Plc and/or its\n" \
     "      subsidiaries. Documentation contributions included herein are the copyrights of\n" \
     "      their respective owners.</p>\n" \
     "    <br />\n" \
diff --git a/doc/global/qt-html-templates-online.qdocconf b/doc/global/qt-html-templates-online.qdocconf
index 040a5483c2..c794c47679 100644
--- a/doc/global/qt-html-templates-online.qdocconf
+++ b/doc/global/qt-html-templates-online.qdocconf
@@ -54,7 +54,7 @@ HTML.footer = \
     "</div>\n" \
     "<div class=\"footer\">\n" \
     "    <p>\n" \
-    "      <acronym title=\"Copyright\">&copy;</acronym> 2012 Digia Plc and/or its\n" \
+    "      <acronym title=\"Copyright\">&copy;</acronym> 2013 Digia Plc and/or its\n" \
     "      subsidiaries. Documentation contributions included herein are the copyrights of\n" \
     "      their respective owners.</p>\n" \
     "    <br />\n" \
diff --git a/doc/global/qt-module-defaults-online.qdocconf b/doc/global/qt-module-defaults-online.qdocconf
index b42b4c4f13..93ecae16fa 100644
--- a/doc/global/qt-module-defaults-online.qdocconf
+++ b/doc/global/qt-module-defaults-online.qdocconf
@@ -7,7 +7,7 @@ include(compat.qdocconf)
 dita.metadata.default.author      = Qt Project
 dita.metadata.default.permissions = all
 dita.metadata.default.publisher   = Qt Project
-dita.metadata.default.copyryear = 2012
+dita.metadata.default.copyryear = 2013
 dita.metadata.default.copyrholder = Digia Plc
 dita.metadata.default.audience = programmer
 
diff --git a/doc/global/qt-module-defaults.qdocconf b/doc/global/qt-module-defaults.qdocconf
index 8c8df29437..15b3724355 100644
--- a/doc/global/qt-module-defaults.qdocconf
+++ b/doc/global/qt-module-defaults.qdocconf
@@ -7,7 +7,7 @@ include(compat.qdocconf)
 dita.metadata.default.author      = Qt Project
 dita.metadata.default.permissions = all
 dita.metadata.default.publisher   = Qt Project
-dita.metadata.default.copyryear = 2012
+dita.metadata.default.copyryear = 2013
 dita.metadata.default.copyrholder = Digia Plc
 dita.metadata.default.audience = programmer
 
diff --git a/examples/opengl/cube/main.cpp b/examples/opengl/cube/main.cpp
index 715d46dde7..a414fad023 100644
--- a/examples/opengl/cube/main.cpp
+++ b/examples/opengl/cube/main.cpp
@@ -50,7 +50,7 @@ int main(int argc, char *argv[])
     QApplication app(argc, argv);
     app.setApplicationName("cube");
     app.setApplicationVersion("0.1");
-#ifdef QT_NO_OPENGL
+#ifndef QT_NO_OPENGL
     MainWidget widget;
     widget.show();
 #else
diff --git a/src/corelib/doc/qtcore.qdocconf b/src/corelib/doc/qtcore.qdocconf
index 61c9d2bc00..cb87530f54 100644
--- a/src/corelib/doc/qtcore.qdocconf
+++ b/src/corelib/doc/qtcore.qdocconf
@@ -37,6 +37,6 @@ exampledirs += \
                snippets \
                ../../../examples/threads/ \
                ../../../examples/tools/ \
-               ../../../examples/widgets/widgets/analogclock
+               ../../../examples/widgets/
 
 imagedirs   += images
diff --git a/src/gui/doc/src/coordsys.qdoc b/src/gui/doc/src/coordsys.qdoc
index 653719e369..e66afcfe55 100644
--- a/src/gui/doc/src/coordsys.qdoc
+++ b/src/gui/doc/src/coordsys.qdoc
@@ -230,7 +230,7 @@
     \row
     \li {2,1}
 
-    \snippet gui/analogclock/main.cpp 1
+    \snippet analogclock/main.cpp 1
 
     We translate the coordinate system so that point (0, 0) is in the
     widget's center, instead of being at the top-left corner. We also
@@ -244,7 +244,7 @@
 
     See also the \l {Window-Viewport Conversion} section.
 
-    \snippet gui/analogclock/main.cpp 2
+    \snippet analogclock/main.cpp 2
 
     We draw the clock's hour hand by rotating the coordinate system
     and calling QPainter::drawConvexPolygon(). Thank's to the
@@ -259,14 +259,14 @@
     the code guarantees that the code that follows won't be disturbed
     by the transformations we've used.
 
-    \snippet gui/analogclock/main.cpp 3
+    \snippet analogclock/main.cpp 3
 
     We do the same for the clock's minute hand, which is defined by
     the four points (1, 0), (0, 1), (-1, 0), and (0, -40). These
     coordinates specify a hand that is thinner and longer than the
     minute hand.
 
-    \snippet gui/analogclock/main.cpp 4
+    \snippet analogclock/main.cpp 4
 
     Finally, we draw the clock face, which consists of twelve short
     lines at 30-degree intervals. At the end of that, the painter is