diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-07-12 12:52:22 +0200 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-07-12 12:52:22 +0200 |
| commit | 2371147354d4436bb54c588662ac315dd4c2f940 (patch) | |
| tree | 5c90b1dd18de394cff2fb4e1bedc628da3c7d341 /examples/painting/composition/composition.html | |
| parent | 54ec6d177e0e8fb04cd01e70461484a80ca1f7a4 (diff) | |
| parent | 82454b6014a7ee0b048b4db8d64a21de849d4ab9 (diff) | |
Merge remote branch 'gerrit/master' into refactor
Conflicts:
src/gui/image/qicon.cpp
src/gui/image/qicon.h
src/gui/image/qicon_p.h
src/gui/text/qfontdatabase.cpp
src/plugins/platforms/wayland/gl_integration/qwaylandglwindowsurface.cpp
src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.cpp
src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglwindow.cpp
sync.profile
Change-Id: Ie0a23a12177ff51bf562e15b2dd41f071afb19b4
Diffstat (limited to 'examples/painting/composition/composition.html')
| -rw-r--r-- | examples/painting/composition/composition.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/painting/composition/composition.html b/examples/painting/composition/composition.html index 1848ad8bd1..82b8991e8f 100644 --- a/examples/painting/composition/composition.html +++ b/examples/painting/composition/composition.html @@ -1,9 +1,9 @@ <html> -<h1>Demo for composition modes</h1> +<h1>Example for composition modes</h1> <p> - This demo shows some of the more advanced composition modes supported by Qt. + This example shows some of the more advanced composition modes supported by Qt. </p> <p> |