Merge commit 'qt/master'

Conflicts:
	doc/src/examples.qdoc
	doc/src/plugins-howto.qdoc
	doc/src/topics.qdoc
	examples/phonon/musicplayer/mainwindow.cpp
	src/3rdparty/freetype/src/base/ftobjs.c
	src/corelib/global/qglobal.h
	src/corelib/tools/qalgorithms.h
	src/corelib/tools/qshareddata.cpp
	src/corelib/tools/qsharedpointer.cpp
	src/corelib/tools/tools.pri
	src/corelib/xml/qxmlstream.h
	src/gui/painting/painting.pri
	src/gui/widgets/qdatetimeedit.cpp
	tests/auto/qdesktopservices/qdesktopservices.pro
	tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
	tests/auto/qtextcodec/test/test.pro

1 files changed, 392 insertions, 0 deletions

diff --git a/doc/src/widgets-and-layouts/gallery-cleanlooks.qdoc b/doc/src/widgets-and-layouts/gallery-cleanlooks.qdoc
new file mode 100644
index 0000000..13c0f8f
--- /dev/null
+++ b/doc/src/widgets-and-layouts/gallery-cleanlooks.qdoc
@@ -0,0 +1,392 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+  \page gallery-cleanlooks.html
+
+  \title Cleanlooks Style Widget Gallery
+  \ingroup gallery
+
+  This page shows some of the widgets available in Qt
+  when configured to use the "cleanlooks" style.
+
+\raw HTML
+<h2 align="center">Buttons</h2>
+
+<table align="center" cellspacing="20%" width="100%">
+<colgroup span="2">
+  <col width="40%" />
+  <col width="40%" />
+</colgroup>
+<tr>
+<td align="center">
+\endraw
+\inlineimage cleanlooks-pushbutton.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage cleanlooks-toolbutton.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QPushButton widget provides a command button.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QToolButton class provides a quick-access button to commands
+       or options, usually used inside a QToolBar.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage cleanlooks-checkbox.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage cleanlooks-radiobutton.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QCheckBox widget provides a checkbox with a text label.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QRadioButton widget provides a radio button with a text or pixmap label.\raw HTML
+</td>
+</tr>
+</table>
+\endraw
+\raw HTML
+<h2 align="center">Containers</h2>
+
+<table align="center" cellspacing="20%" width="100%">
+<colgroup span="2">
+  <col width="40%" />
+  <col width="40%" />
+</colgroup>
+<tr>
+<td align="center">
+\endraw
+\inlineimage cleanlooks-groupbox.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage cleanlooks-tabwidget.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QGroupBox widget provides a group box frame with a title.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QTabWidget class provides a stack of tabbed widgets.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage cleanlooks-frame.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage cleanlooks-toolbox.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QFrame widget provides a simple decorated container for other widgets.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QToolBox class provides a column of tabbed widget items.\raw HTML
+</td>
+</tr>
+</table>
+\endraw
+\raw HTML
+<h2 align="center">Item Views</h2>
+
+<table align="center" cellspacing="20%" width="100%">
+<colgroup span="2">
+  <col width="40%" />
+  <col width="40%" />
+</colgroup>
+<tr>
+<td align="center">
+\endraw
+\inlineimage cleanlooks-listview.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage cleanlooks-treeview.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QListView class provides a default model/view implementation of a list/icon view. The QListWidget class provides a classic item-based list/icon view.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QTreeView class provides a default model/view implementation of a tree view. The QTreeWidget class provides a classic item-based tree view.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage cleanlooks-tableview.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QTableView class provides a default model/view implementation of a table view. The QTableWidget class provides a classic item-based table view.\raw HTML
+</td>
+</tr>
+</table>
+\endraw
+\raw HTML
+<h2 align="center">Display Widgets</h2>
+
+<table align="center" cellspacing="20%" width="100%">
+<colgroup span="2">
+  <col width="40%" />
+  <col width="40%" />
+</colgroup>
+<tr>
+<td align="center">
+\endraw
+\inlineimage cleanlooks-progressbar.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage cleanlooks-lcdnumber.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QProgressBar widget provides a horizontal progress bar.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QLCDNumber widget displays a number with LCD-like digits.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage cleanlooks-label.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QLabel widget provides a text or image display.\raw HTML
+</td>
+</tr>
+</table>
+\endraw
+\raw HTML
+<h2 align="center">Input Widgets</h2>
+
+<table align="center" cellspacing="20%" width="100%">
+<colgroup span="2">
+  <col width="40%" />
+  <col width="40%" />
+</colgroup>
+<tr>
+<td align="center">
+\endraw
+\inlineimage cleanlooks-slider.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage cleanlooks-lineedit.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QSlider widget provides a vertical or horizontal slider.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QLineEdit widget is a one-line text editor.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage cleanlooks-combobox.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage cleanlooks-doublespinbox.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QComboBox widget is a combined button and pop-up list.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QDoubleSpinBox class provides a spin box widget that allows double precision floating point numbers to be entered.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage cleanlooks-spinbox.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage cleanlooks-timeedit.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QSpinBox class provides a spin box widget.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QTimeEdit class provides a widget for editing times.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage cleanlooks-dateedit.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage cleanlooks-datetimeedit.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QDateEdit class provides a widget for editing dates.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QDateTimeEdit class provides a widget for editing dates and times.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage cleanlooks-textedit.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage cleanlooks-horizontalscrollbar.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QTextEdit class provides a widget that is used to edit and
+     display both plain and rich text.\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QScrollBar widget provides a vertical or horizontal scroll bar. Here, we show a scroll bar with horizontal orientation.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage cleanlooks-dial.png
+\raw HTML
+</td>
+<td align="center">
+\endraw
+\inlineimage cleanlooks-calendarwidget.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QDial class provides a rounded range control (like a
+       speedometer or potentiometer).\raw HTML
+</td>
+<td halign="justify" valign="top">
+\endraw
+The QCalendarWidget class provides a monthly calendar widget that can be used to select dates.\raw HTML
+</td>
+</tr>
+<tr>
+<td align="center">
+\endraw
+\inlineimage cleanlooks-fontcombobox.png
+\raw HTML
+</td>
+</tr><tr>
+<td halign="justify" valign="top">
+\endraw
+The QFontComboBox widget is a specialized combobox that enables fonts to be selected from a pop-up list containing previews of available fonts.\raw HTML
+</td>
+</tr>
+</table>
+\endraw
+*/