Commit 2108b2de authored by Leena Miettinen's avatar Leena Miettinen

Doc: Qt Quick Designer features are no longer commercial only

Change-Id: Ic908670b3f8be7491e2639b3a2d524382580d7e5
Reviewed-by: default avatarThomas Hartmann <Thomas.Hartmann@digia.com>
parent 9f2f41e2
......@@ -47,14 +47,6 @@
\li \l{Analyzing CPU Usage}{CPU Usage Analyzer}
\li \l{http://doc.qt.io/QtQuickCompiler/}{Qt Quick Compiler}
integration
\li \l{Using Qt Quick Designer Extensions}
{Qt Quick Designer extensions}:
\list
\li \l{Adding Connections}{Connections view}
\li \l{Editing PathView Properties}{PathView property editor}
\li \l{Using Qt Quick UI Forms}{Export button} for exporting
items as alias properties
\endlist
\li \l{http://doc.qt.io/QtForDeviceCreation/index.html}{Developing for
embedded devices}
\endlist
......
......@@ -56,8 +56,7 @@
Learn how to develop a Qt Quick application by using UI forms.
UI forms are split into \e .qml and \e .js files that contain the
business logic, and \e .ui.qml files that only contain the purely
declarative description of the UI. Note that some of the described
features are only available in the commercial version of \QC.
declarative description of the UI.
\endlist
......
......@@ -178,15 +178,12 @@
\li \l {Creating Qt Quick Projects}
\li \l {Qt Quick UI Forms}
\li \l {Using Qt Quick Designer}
\li \l {Editing PathView Properties}
\li \l {Adding Connections}
\li \l {Creating Components}
\li \l {Creating Buttons}
\li \l {Creating Scalable Buttons and Borders}
\li \l {Creating Screens}
\li \l {Using Qt Quick Designer Extensions}
\list
\li \l{Editing PathView Properties}
\li \l{Adding Connections}
\endlist
\li \l {Exporting Designs from Graphics Software}
\li \l {Using QML Modules with Plugins}
\endlist
......
......@@ -48,6 +48,16 @@
You can use the code editor (Edit mode) or the visual editor (Design
mode) to develop Qt Quick applications.
\li \l {Editing PathView Properties}
You can use a graphical spline editor to specify \l{PathView} paths.
A path view lays out data provided by data models on a \l{Path}.
\li \l {Adding Connections}
You can connect objects to signals, specify dynamic properties for
objects, and create bindings between the properties of two objects.
\li \l {Creating Components}
You can use basic QML types to create your own components that you
......@@ -58,10 +68,7 @@
You can combine basic QML types with ready-made Qt Quick Controls,
Dialogs, and Layouts (available since Qt 5.1) to create screens. You
can use states and transitions to navigate between screens.
\li \l {Using Qt Quick Designer Extensions}
\QMLD contains commercial features that make developing Qt Quick
applications faster and easier.
\li \l {Exporting Designs from Graphics Software}
You can export designs from graphics software, such as Adobe
......
......@@ -35,9 +35,7 @@
\title Adding Connections
\commercial
You can use the \uicontrol {Connections} view (commercial only) to:
You can use the \uicontrol {Connections} view to:
\list
......
/****************************************************************************
**
** Copyright (C) 2015 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing
**
** This file is part of Qt Creator.
**
** 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 The Qt Company. For licensing terms and
** conditions see http://www.qt.io/terms-conditions. For further information
** use the contact form at http://www.qt.io/contact-us.
**
** 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, The Qt Company gives you certain additional
** rights. These rights are described in The Qt Company LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
****************************************************************************/
/*!
\contentspage {Qt Creator Manual}
\previouspage quick-screens.html
\page creator-qtquick-designer-extensions.html
\nextpage qmldesigner-pathview-editor.html
\title Using Qt Quick Designer Extensions
\commercial
\image qmldesigner-extensions.png
\QMLD contains commercial features that make developing Qt Quick
applications faster and easier:
\list
\li \l{Editing PathView Properties}
Use a spline editor to specify properties for a PathView object.
\li \l{Adding Connections}
Create connections between objects, signals, and object properties.
\endlist
*/
......@@ -56,7 +56,7 @@
import to the project, and other resources.
\li \uicontrol Connections (3) enables you to create connections between
objects, signals, and object properties (commercial only). For
objects, signals, and object properties. For
more information, see \l{Adding Connections}.
\li \uicontrol {Projects} shows a list of projects open in the current
......@@ -360,7 +360,7 @@
\section2 Editing Properties Inline
You can double-click objects on the canvas to edit their text, color, or
source properties inline (commercial only).
source properties inline.
Because you can specify several of these properties for some QML types, such
as TextEdit, you can also right-click objects to open the inline editors
from a context-menu.
......
......@@ -35,12 +35,10 @@
\title Editing PathView Properties
\commercial
A \l{PathView} lays out data provided by data models on a \l{Path}.
A graphical spline editor enables you to specify PathView paths, which
is a non-trivial task to do in the code editor (commercial only).
is a non-trivial task to do in the code editor.
\image qmldesigner-pathview-editor.png "PathView editor"
......
......@@ -34,9 +34,6 @@
You can use \QC wizards to create UI forms that have the filename extension
\e .ui.qml. The UI forms contain a purely declarative subset of the QML
language. It is recommended that you edit the forms in the \uicontrol Design mode.
However, exporting items as alias properties is a commercial only feature,
and therefore you must use the \uicontrol Edit mode to do it if you are
using the open source version of \QC.
\QC enforces the use of the supported QML features by displaying error
messages.
......@@ -88,8 +85,8 @@
The property alias exports the button to the QML code that uses the form.
You can use the
\inlineimage qmldesigner-export-item-button.png
(\uicontrol Export) button in the \uicontrol Navigator to export an item as a property
(commercial only):
(\uicontrol Export) button in the \uicontrol Navigator to export an item as
a property:
\image qmldesigner-export-item.png
......
......@@ -23,17 +23,12 @@
\title Using Qt Quick UI Forms
\commercial
This tutorial describes how to develop an application that uses \e ui.qml
files to separate the application logic from the UI. The tutorial uses \QMLD
to implement a simplified version of the \l{Qt Quick Controls - UI Forms}
{UI Forms example}, which provides an interface to a customer database and
is purely written in QML and JavaScript.
\note Some of the described features are only available in the commercial
version of \QC.
\image qmldesigner-uiforms-example.png
\e {UI forms} consist of \e .qml and \e .js files that implement the
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment