Merge branch 'dev' into stable

This starts Qt 5.1 release cycle

Conflicts:
	src/qtdesktop/CheckBox.qml
	src/qtdesktop/doc/qtdesktopcomponents.qdocconf

Change-Id: Ic3799053a18b0a3f97e251354ad8433438b08a7a

1 files changed, 31 insertions, 0 deletions

diff --git a/src/controls/doc/src/controls.qdoc b/src/controls/doc/src/controls.qdoc
new file mode 100644
index 00000000..d1e4d052
--- /dev/null
+++ b/src/controls/doc/src/controls.qdoc
@@ -0,0 +1,31 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.  Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \group controls
+    \title Buttons and Controls
+*/