diff --git a/doc/src/examples-android.qdoc b/doc/src/examples-android.qdoc
index 94aafd86bf2e903ca689406f47f10b2325fdb884..ab8782662427dbeb03ebf66a2e296cbfcf02864f 100644
--- a/doc/src/examples-android.qdoc
+++ b/doc/src/examples-android.qdoc
@@ -65,8 +65,8 @@
of Qt Quick examples including beginner-level tutorials, visit
\l{Qt Quick Examples and Tutorials}.
- \div {class="landingicons"}
- \div {class="icons1of3"}
+ \div {class="multi-column"}
+ \div {class="doc-column"}
\b{Touch and Key Interaction}
\list
\li \l{Qt Quick Examples - Touch Interaction}{Touch Interaction}
@@ -74,7 +74,7 @@
\li \l{Qt Quick Examples - MouseArea}{MouseArea}
\endlist
\enddiv
- \div {class="icons1of3"}
+ \div {class="doc-column"}
\b{Images, Animation, and Layout}
\list
\li \l{Qt Quick Examples - Image Elements}{Image Elements}
@@ -85,7 +85,7 @@
\li \l{Qt Quick Examples - Right to Left}{Right to Left}
\endlist
\enddiv
- \div {class="icons1of3"}
+ \div {class="doc-column"}
\b{Scenegraph}
\list
\li \l{Scene Graph - Custom Geometry}{Custom Geometry}
@@ -96,10 +96,7 @@
\li \l{Scene Graph - Simple Material}{Simple Material}
\endlist
\enddiv
- \enddiv
-
- \div {class="landingicons"}
- \div {class="icons1of3"}
+ \div {class="doc-column"}
\b{Particles and Effects}
\list
\li \l{Qt Quick Particles Examples - Emitters}{Emitters} (Particles)
@@ -109,7 +106,7 @@
\li \l{Qt Quick Examples - Shader Effects}{Shader Effects}
\endlist
\enddiv
- \div {class="icons1of3"}
+ \div {class="doc-column"}
\b{Extending QML}
\list
\li \l{Extending QML - Grouped Properties Example}{Grouped Properties}
@@ -118,7 +115,7 @@
\li \l{Extending QML - Attached Properties Example}{Attached Properties}
\endlist
\enddiv
- \div {class="icons1of3"}
+ \div {class="doc-column"}
\b{Multimedia}
\list
\li \l{QML Video Shader Effects Example}{Video Shader Effects Example}
diff --git a/doc/src/examples-ios.qdoc b/doc/src/examples-ios.qdoc
index cbfa0612db4c1ffbf9f52c9e1f87d40a9297e9d1..235095cc5bdefe36d1b8ee27f84043865ae247f4 100644
--- a/doc/src/examples-ios.qdoc
+++ b/doc/src/examples-ios.qdoc
@@ -63,8 +63,8 @@
of Qt Quick examples including beginner-level tutorials, visit
\l{Qt Quick Examples and Tutorials}.
- \div {class="landingicons"}
- \div {class="icons1of3"}
+ \div {class="multi-column"}
+ \div {class="doc-column"}
\b{Images, Animation, and Layout}
\list
\li \l{Qt Quick Examples - Image Elements}{Image Elements}
@@ -76,7 +76,7 @@
\li \l{Qt Quick Examples - Shader Effects}{Shader Effects}
\endlist
\enddiv
- \div {class="icons1of3"}
+ \div {class="doc-column"}
\b{Touch and Key Interaction}
\list
\li \l{Qt Quick Examples - Touch Interaction}{Touch Interaction}
diff --git a/doc/src/examples.qdoc b/doc/src/examples.qdoc
index 3399b9ea0e226330e733d98e6266b9ffba3cd48f..4b556d1a68cb2a94b41296cfcd565eaa9fc99276 100644
--- a/doc/src/examples.qdoc
+++ b/doc/src/examples.qdoc
@@ -38,7 +38,7 @@
The examples are part of the Qt packages. Visit the \l Downloads page for
more information.
- \section2 Running the Examples
+ \section1 Running the Examples
Open and run examples within Qt Creator's \gui{Welcome} mode. Most of the
examples run on various platforms and to search for platform-specific
@@ -52,17 +52,16 @@
To view a list of all Qt examples, visit the \l{List of Qt Examples} page.
- \div {class="landingicons"}
- \div {class="icons1of3"}
+ \div {class="multi-column"}
+ \div {class="doc-column"}
\b{Setting Up Projects}
\list
\li \l{Qt Creator: Creating Qt Quick Projects}{Qt Quick Projects}
\li \l{Qt Creator: Creating a Qt Widget Based Application}{Qt Widget Projects}
\li \l{Qt Creator: Configuring Projects}{Configuring Projects}
\endlist
-
\enddiv
- \div {class="icons1of3"}
+ \div {class="doc-column"}
\b{Essentials}
\list
\li \l{Qt Creator: Building for Multiple Platforms}{Building for Multiple Platforms}
@@ -74,7 +73,7 @@
\li \l{Qt Creator: Building and Running}{See more}
\endlist
\enddiv
- \div {class="icons1of3"}
+ \div {class="doc-column"}
\b{Platform Examples}
\list
\li \l{Qt for Android Examples}{Android}
@@ -84,10 +83,7 @@
\li \l{Active Qt#Examples}{Active Qt Examples}
\endlist
\enddiv
- \enddiv
-
- \div {class="landingicons"}
- \div {class="icons1of3"}
+ \div {class="doc-column"}
\b{QML and Qt Quick}
\list
\li \l{First Steps with QML}
@@ -99,7 +95,7 @@
\li \l{Qt Quick Examples and Tutorials}{See more}
\endlist
\enddiv
- \div {class="icons1of3"}
+ \div {class="doc-column"}
\b{Widgets}
\list
\li \l{Getting Started Programming with Qt Widgets}{Text Editor}
@@ -113,7 +109,7 @@
\li \l{Qt Widgets Examples}{See more}
\endlist
\enddiv
- \div {class="icons1of3"}
+ \div {class="doc-column"}
\b{Graphics}
\list
\li \l{Scene Graph - OpenGL Under QML}{OpenGL Under QML}
@@ -124,10 +120,7 @@
\li \l{Animation Framework Examples}
\endlist
\enddiv
- \enddiv
-
- \div {class="landingicons"}
- \div {class="icons1of3"}
+ \div {class="doc-column"}
\b{Data and Networking}
\list
\li \l{Network Examples}
@@ -140,7 +133,7 @@
\li \l{Qt WebKit Examples}{WebKit Examples}
\endlist
\enddiv
- \div {class="icons1of3"}
+ \div {class="doc-column"}
\b{Applications}
\list
\li \l{Application Example}
@@ -149,7 +142,7 @@
\li \l{Plug & Paint Example} (Plugin Example)
\endlist
\enddiv
- \div {class="icons1of3"}
+ \div {class="doc-column"}
\b{Processes and Threads}
\list
\li \l{Threading Basics}
@@ -158,11 +151,7 @@
\li \l{IPC Examples}{Inter-Process Communication (IPC) Examples}
\endlist
\enddiv
- \enddiv
-
-
- \div {class="landingicons"}
- \div {class="icons1of3"}
+ \div {class="doc-column"}
\b{Multimedia}
\list
\li \l{Media Player Example}{Media Player}
@@ -173,7 +162,7 @@
\li \l{Qt Multimedia Examples}{See more}
\endlist
\enddiv
- \div {class="icons1of3"}
+ \div {class="doc-column"}
\b{Peripheral Devices}
\list
\li \l{Qt Serial Port Examples}{Serial Port Examples}
@@ -183,7 +172,7 @@
\li \l{Qt Positioning Examples}{Positioning Examples}
\endlist
\enddiv
- \div {class="icons1of3"}
+ \div {class="doc-column"}
\b{Tools}
\list
\li \l{Qt Assistant Examples}
diff --git a/doc/src/legal/licenses.qdoc b/doc/src/legal/licenses.qdoc
index e3bdf922573842d9eaf2134e6754cecec2c7deee..2da479fed3d97c13be270327e2cb44cd7baf741d 100644
--- a/doc/src/legal/licenses.qdoc
+++ b/doc/src/legal/licenses.qdoc
@@ -87,7 +87,7 @@
\note Cross-module dependencies are also described on a general level. All Qt
modules depend on \l{Qt Core}.
- \table 80%
+ \table
\header \li Qt Module/Tool \li Component \li Description \li License Type \li Notes
\row \li {1,26} Qt Core