Merge branch '4.7-oslo1' into 4.7-doc

8 files changed, 62 insertions, 20 deletions

diff --git a/doc/src/declarative/extending.qdoc b/doc/src/declarative/extending.qdoc
index 6388764..0cc989d 100644
--- a/doc/src/declarative/extending.qdoc
+++ b/doc/src/declarative/extending.qdoc
@@ -674,6 +674,16 @@ declaring a new property, and the corresponding C++ type.
 \row \o variant \o QVariant
 \endtable
 
+From QML you can also declare object and list properties using any element name
+like this:
+
+\code
+    property QtObject objectProperty
+    property Item itemProperty
+    property MyCustomType customProperty
+    property list<Item> listOfItemsProperty
+\endcode
+
 QML supports two methods for adding a new property to a type: a new property
 definition, and a property alias.
 
diff --git a/doc/src/getting-started/known-issues.qdoc b/doc/src/getting-started/known-issues.qdoc
index 0fa23f6..0c2d8d8 100644
--- a/doc/src/getting-started/known-issues.qdoc
+++ b/doc/src/getting-started/known-issues.qdoc
@@ -63,10 +63,6 @@
 
     \list
 
-    \o Performing a new install of the Qt 4.6 beta on Snow Leopard
-       triggers a bug in the installer that causes the install to fail.
-       Updating an existing Qt installation works fine.
-
     \o There are two workarounds, either disable spotlight for the target
        drive during the install, or do a custom install where you deselect
        documentation and examples. Run the installer again as a full
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index e45892f..edb4d1e 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -77,7 +77,7 @@
                 <ul>
                     <li><a href="qtquick.html">Qt Quick</a></li>
                     <li><a href="qdeclarativeintroduction.html">Introduction to QML</a></li>
-                    <li><a href="qdeclarativeelements.html">QML Elements</a></li>
+                    <li><a href="qmlelements.html">QML Elements</a></li>
                     <li><a href="qdeclarativeexamples.html">QML Examples and Demos</a></li>
                 </ul>
               </div>
@@ -99,7 +99,7 @@
                   <li><a href="linguist-manual.html">Qt Linguist</a></li>
                   <li><a href="assistant-manual.html">Qt Assistant</a></li>
                   <li><a href="qmake-manual.html">Qt qmake</a></li>
-                  <li><a href="http://doc.qt.nokia.com/qtsimulator-1.0/simulator-description.html">Qt Simulator</a></li>
+                  <li><a href="http://doc.qt.nokia.com/qtsimulator-1.0/index.html">Qt Simulator</a></li>
                   <li><a href="http://qt.nokia.com/developer/eclipse-integration">Eclipse Integration</a></li>
                   <li><a href="http://qt.nokia.com/products/appdev">Add-On Products and Services</a></li>
                   <li><a href="qvfb.html">Virtual Framebuffer</a></li>
diff --git a/doc/src/legal/3rdparty.qdoc b/doc/src/legal/3rdparty.qdoc
index e7133e3..db6ff7c 100644
--- a/doc/src/legal/3rdparty.qdoc
+++ b/doc/src/legal/3rdparty.qdoc
@@ -683,4 +683,36 @@
     THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
     (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
     OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+	
+    \hr
+
+	jquery 1.4.2.js Copyright 2010 John Resig
+	This software is dual licensed under the MIT or GPL version 2 licenses.
+	Nokia has used the software herein under the MIT license.
+
+	jquery includes Sizzle.js Copyright 2010 The Dojo Foundaton and is
+	licensed under the MIT, BSD and GPL licenses.  Nokia has used this
+	software herein under the MIT license.
+
+	The MIT License
+
+	Permission is hereby granted, free of charge, to any person obtaining a copy
+	of this software and associated documentation files (the "Software"), to deal
+	in the Software without restriction, including without limitation the rights
+	to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+	copies of the Software, and to permit persons to whom the Software is
+	furnished to do so, subject to the following conditions:
+
+	The above copyright notice and this permission notice shall be included in
+	all copies or substantial portions of the Software.
+
+	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+	AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+	LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+	OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+	THE SOFTWARE.
+	
+	
 */
diff --git a/doc/src/platforms/compiler-notes.qdoc b/doc/src/platforms/compiler-notes.qdoc
index c6ecd68..3870e8f 100644
--- a/doc/src/platforms/compiler-notes.qdoc
+++ b/doc/src/platforms/compiler-notes.qdoc
@@ -68,7 +68,7 @@
     \endtable
 
     * WebKit is only supported as a dynamically built library. Static linkage is not supported.
-
+    
     \target GCC
     \section1 GCC
 
@@ -115,6 +115,7 @@
     \section2 Solaris
 
     Please use GCC 3.4.2 or later.
+	Please not that WebKit is not supported for Solaris, regardless of which compiler is used.
 
     \section2 Mac OS X
 
diff --git a/doc/src/platforms/supported-platforms.qdoc b/doc/src/platforms/supported-platforms.qdoc
index 6e9fb3d..83cd89b 100644
--- a/doc/src/platforms/supported-platforms.qdoc
+++ b/doc/src/platforms/supported-platforms.qdoc
@@ -85,11 +85,10 @@
 
     \section1 Tier 2 Platforms
 
-    Tier 2 platforms are subjected to our unit test suite and other internal testing
-    tools prior to release of new product versions.  Qt users should note, however,
-    that errors may be present in released product versions for Tier 2 platforms and,
-    subject to resource availability, known errors in Tier 2 platforms may or may not
-    be corrected prior to new version releases.
+    Tier 2 platforms are subject to ad hoc and internal testing. However, Qt users
+	should note that errors may be present in released product versions for Tier 2
+	platforms and, subject to resource availability, known errors in Tier 2 platforms
+	may or may not be corrected prior to new version releases.
 
     \table
     \header \o Platform
diff --git a/doc/src/qt4-intro.qdoc b/doc/src/qt4-intro.qdoc
index a88b326..8684ad2 100644
--- a/doc/src/qt4-intro.qdoc
+++ b/doc/src/qt4-intro.qdoc
@@ -475,7 +475,8 @@
     \i Qt Creator has been improved to support interactive editing of
     QML UIs through drag-and-drop. The text editor supports the QML
     syntax and provides authoring assistance such as auto-completion,
-    error lookup, help lookup and easy preview of QML UI's.
+    error lookup, help lookup and easy preview of QML UI's. The Qt
+	Quick features in Qt Creator will be released with Qt Creator 2.1
     \endlist
 
     \section1 Network Bearer Management
diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css
index 9afff03..6cc1cb6 100755
--- a/doc/src/template/style/style.css
+++ b/doc/src/template/style/style.css
@@ -35,6 +35,10 @@
     {
         list-style: none;
     }
+    ol li
+    {
+        list-style: decimal;
+    }
     caption, th
     {
         text-align: left;
@@ -790,13 +794,12 @@
 		padding-left:12px;
     }
 
-
-
-
-
-
-
-
+    .wrap .content ol li
+    {
+	background:none;
+    margin-bottom: 10px; 
+	padding-left:0px;
+    }
 
     .content li:hover  {}