doc: Added info on two ways to customize the style.

2 files changed, 19 insertions, 10 deletions

diff --git a/src/gui/styles/qproxystyle.cpp b/src/gui/styles/qproxystyle.cpp
index 0e19359..94269b0 100644
--- a/src/gui/styles/qproxystyle.cpp
+++ b/src/gui/styles/qproxystyle.cpp
@@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE
     Below is an example that overrides the shortcut underline
     behavior on all platforms:
 
-    \snippet doc/src/snippets/code/src_gui_qproxystyle.cpp 0
+    \snippet doc/src/snippets/code/src_gui_qproxystyle.cpp 1
 
     Warning: Although Qt's internal styles should respect this hint,
     there is no guarantee that it will work for all styles. It would
diff --git a/src/gui/styles/qstyle.cpp b/src/gui/styles/qstyle.cpp
index 6ca301c..c848022 100644
--- a/src/gui/styles/qstyle.cpp
+++ b/src/gui/styles/qstyle.cpp
@@ -168,12 +168,21 @@ static int unpackControlTypes(QSizePolicy::ControlTypes controls, QSizePolicy::C
 
     \section1 Creating a Custom Style
 
-    If you want to design a custom look and feel for your application,
-    the first step is to pick one of the styles provided with Qt to
-    build your custom style from. The choice will depend on which
-    existing style resembles your style the most. The most general
-    class that you can use as base is QCommonStyle (and not QStyle).
-    This is because Qt requires its styles to be \l{QCommonStyle}s.
+    You can create a custom look and feel for your application by
+    creating a custom style. There are two approaches to creating a
+    custom style. In the static approach, you either choose an
+    existing QStyle class, subclass it, and reimplement virtual
+    functions to provide the custom behavior, or you create an entire
+    QStyle class from scratch. In the dynamic approach, you modify the
+    behavior of your system style at runtime. The static approach is
+    described below. The dynamic approach is described in QProxyStyle.
+
+    The first step in the static approach is to pick one of the styles
+    provided by Qt from which you will build your custom style. Your
+    choice of QStyle class will depend on which style resembles your
+    desired style the most. The most general class that you can use as
+    a base is QCommonStyle (not QStyle). This is because Qt requires
+    its styles to be \l{QCommonStyle}s.
 
     Depending on which parts of the base style you want to change,
     you must reimplement the functions that are used to draw those
@@ -222,7 +231,7 @@ static int unpackControlTypes(QSizePolicy::ControlTypes controls, QSizePolicy::C
     \section1 Using a Custom Style
 
     There are several ways of using a custom style in a Qt
-    application. The simplest way is call the
+    application. The simplest way is to pass the custom style to the
     QApplication::setStyle() static function before creating the
     QApplication object:
 
@@ -232,8 +241,8 @@ static int unpackControlTypes(QSizePolicy::ControlTypes controls, QSizePolicy::C
     it before the constructor, you ensure that the user's preference,
     set using the \c -style command-line option, is respected.
 
-    You may want to make your style available for use in other
-    applications, some of which may not be yours and are not available for
+    You may want to make your custom style available for use in other
+    applications, which may not be yours and hence not available for
     you to recompile. The Qt Plugin system makes it possible to create
     styles as plugins. Styles created as plugins are loaded as shared
     objects at runtime by Qt itself. Please refer to the \link