Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

3 files changed, 137 insertions, 4 deletions

diff --git a/doc/src/declarative/modules.qdoc b/doc/src/declarative/modules.qdoc
index 5933223..194be40 100644
--- a/doc/src/declarative/modules.qdoc
+++ b/doc/src/declarative/modules.qdoc
@@ -20,3 +20,103 @@ the component issuing the import.
 
 The import statement cannot be used by remote content.
 */
+
+/*
+
+Ideas for full module support....
+
+
+* Modularity within applications
+
+This is the currently-supported mechanism.
+
+By using the "import" statement, a subdirectory of types can be added to the
+empty namespace. Alternatively, a type in a subdirectory can be referenced
+explicitly.
+
+So, given these files:
+
+    ./SubModule1/Type1.qml
+    ./SubModule2/Type1.qml
+
+This is valid QML:
+
+    import "SubModule1"
+    Type1 { ... }
+    SubModule2.Type1 { ... }
+
+
+* System-installed modules (dependencies)
+
+To use system-installed modules, the dependency must be explicitly stated
+using the "require" statement. Types in required modules must still be
+explicitly qualified. Dependencies cannot be added to the empty namespace.
+
+    QMLPATH=/opt/Nokia/qml:/usr/share/lib/qml
+    /opt/Nokia/qml/Module1/Type1.qml
+    /usr/share/lib/qml/Module1/Type1.qml
+
+    require "Module1"
+    Module1.Type1 { ... }
+
+
+* Grouping of components within application modules
+
+Sub-sub directories allow further grouping of types.
+
+    ./SubModule1/Group1/*.qml
+    ./SubModule1/Group2/*.qml
+
+    SubModule1.Group1.Type1 { ... }
+    SubModule1.Group1.Type2 { ... }
+    SubModule1.Group2.Type1 { ... }
+    SubModule1.Group2.Type2 { ... }
+
+    import "SubModule1/Group1"
+    Type1 { ... }
+
+    import "SubModule1"
+    Group1.Type1 { ... }
+
+
+* Grouping of components within system-installed modules
+
+System-installed types may also be grouped into types. The hierarchy is a
+global namespace, so such grouping is recommended to reduce clashes.
+
+    /opt/Nokia/qml/Module1/Group1/*.qml
+    /opt/Nokia/qml/Module1/Group2/*.qml
+
+    require "Module1"
+    Module1.Group1.Type1 { ... }
+    Module1.Group1.Type2 { ... }
+    Module1.Group2.Type1 { ... }
+    Module1.Group2.Type2 { ... }
+
+    require "Module1/Group1"
+    Group1.Type1 { ... }
+
+    // Alternative syntax
+    /opt/qml/com/nokia/qml/Module1/Group1/*.qml
+    require "com.nokia.qml.Module1.Group1"
+    Group1.Type1 { ... }
+
+
+* Private sub-components
+
+Directories begining with _ cannot be referenced except by types in the
+directory immediately containing it.
+
+    /opt/Nokia/qml/Module1/_private/Type1.qml
+    ./SubModule1/_private/Type1.qml
+
+    SubModule1._private.Type1 { ... } // Not allowed
+    import "SubModule1._private" // Not allowed
+    require "SubModule1._private" // Not allowed
+    require "SubModule1"
+    Module1._private.Type1 { ... } // Not allowed
+
+    import "_private" // allowed
+    Type1 { ... }
+
+*/
diff --git a/doc/src/diagrams/programs/easingcurve/main.cpp b/doc/src/diagrams/programs/easingcurve/main.cpp
index 98e9d37..8d399a3 100644
--- a/doc/src/diagrams/programs/easingcurve/main.cpp
+++ b/doc/src/diagrams/programs/easingcurve/main.cpp
@@ -1,11 +1,41 @@
 /****************************************************************************
 **
-** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Qt Software Information (qt-info@nokia.com)
 **
-** This file is part of the $MODULE$ of the Qt Toolkit.
+** This file is part of the examples of the Qt Toolkit.
 **
-** $TROLLTECH_DUAL_LICENSE$
+** $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 qt-sales@nokia.com.
+** $QT_END_LICENSE$
 **
 ****************************************************************************/
 
diff --git a/doc/src/richtext.qdoc b/doc/src/richtext.qdoc
index fbd8adb..6ea82f8 100644
--- a/doc/src/richtext.qdoc
+++ b/doc/src/richtext.qdoc
@@ -1058,8 +1058,11 @@ Ideas for other sections:
             \o Specifies where an image or a text will be placed in another element. Note that the \c float property is
                only supported for tables and images.
     \row    \o \c text-transform
-            \o [ uppercase | lowercase | smallcaps ]
+            \o [ uppercase | lowercase ]
             \o Select the transformation that will be performed on the text prior to displaying it.
+    \row    \o \c font-variant
+            \o small-caps
+            \o Perform the smallcaps transformation on the text prior to displaying it.
     \row    \o \c word-spacing
             \o <width>px
             \o Specifies an alternate spacing between each word.