Commit Graph

207 Commits

Author SHA1 Message Date
Leena Miettinen
983e2cd09d Doc: Update Qt Quick UI Prototype wizard docs
The wizard name has changed.
The option to create an ui.qml file has been replaces with
the option to add a virtual keyboard.

Change-Id: I2466500dcabda59586806939c0e7b8f3100d6677
Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-11-21 15:00:43 +00:00
Leena Miettinen
072e8c323b Doc: Update Accelerate Bubble example to use the Swipe wizard
Change-Id: I6f3d88788707c4ecd18c327c9145529ec0bd8fc6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-11-07 09:33:18 +00:00
Leena Miettinen
a1a47242c6 Doc: Update the Transitions example to use the Swipe wizard
Change-Id: I17e6d8ddba96d28ea8f533d5993f8665fd380ca0
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-11-07 09:31:21 +00:00
Leena Miettinen
7cf755bc06 Doc: Update info about Qt Quick Application project wizards
There are now wizards for creating apps that use Qt Quick 2
types or Qt Quick 2 controls (ScrollView, StackView, or SwipeView).
Some wizards generate ui.qml pages, while others don't. Therefore,
an include file can no longer be shared between the tutorials and
the creating projects topic.

Change-Id: If06e20511cb5f6fe9da28feff40cec0250a49416
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-11-07 09:26:12 +00:00
Leena Miettinen
56cd215c6d Doc: Describe hiding invisible items in the Qt Quick Designer Navigator
Update screenshots.

Change-Id: I8335131298d2a400403be2879f4f363d687c78cc
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-11-06 11:43:16 +00:00
Leena Miettinen
b0039fae98 Doc: Add a step list to Using QML Modules with Plugins
Reorganize the sections in the topic to match the order of the
list.

Task-number: QTBUG-63480
Change-Id: I976647fa11e3046abcd5aad322bf60029656b3e4
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-10-18 07:28:35 +00:00
Leena Miettinen
5ce499ce65 Doc: Update docs after Ant support was removed
Gradle is now used for building APKs.

Change-Id: I9ccecac39b70ada5ef1b63a7311ad9187ba0d6b9
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-10-13 10:43:16 +00:00
Leena Miettinen
03dce9a65f Doc: Use the umbrella term "device" for both mobile and embedded
Add a glossary entry for "device" to make changing the definition
easy and link the first occurrence of "device" in a topic to it,
where applicable.

Change-Id: Ia1b8b669b0000eea47d6a7b9860d3329d93a4395
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2017-08-18 14:53:27 +00:00
Leena Miettinen
f4f79a352c Doc: Fix paths to Qt Quick Toolbar options
The options were moved to the "QML/JS Editing" tab.

Change-Id: Ieccc6b1fa2d051a6986a6050bff6d0a6710ffb26
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-08-10 09:42:06 +00:00
Leena Miettinen
d785999512 Doc: Describe QML Asset Exporter
...as the chosen tool for exporting designs from Adobe Photoshop
to .ui.qml files. Remove the descriptions of using the old
export script.

Change-Id: Ib09d737c43debcf9773ba9145d66d5f6d91a4c98
Task-number: QTCREATORBUG-18486
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-07-21 06:57:21 +00:00
Leena Miettinen
0fe55f3b80 Doc: Add build system selection step to wizard instructions
This was still missing from the Qt Quick Application wizard docs.

Change-Id: I8e94d61080dc7877eb354c9342f49cdc1a6b01ed
Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-06-08 09:16:03 +00:00
Leena Miettinen
a17d4f9a5e Doc: Add info about modifying properties for states
Update screenshots.

Change-Id: I6be8a9a844f6c822650fa817756987a43abbd993
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-05-09 11:13:54 +00:00
Leena Miettinen
87276046be Doc: Describe editing the when condition of states
...in the Qt Quick Designer States pane.

Change-Id: Ie2a2252d295d6d0ae37744b7cc7691d5a1c3022f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-05-09 11:10:43 +00:00
Leena Miettinen
92918158e1 Doc: Add a link to the Qt Quick Controls 2 - Contact List example
...to the section that describes using the QML_DESIGNER_IMPORT_PATH
option in a project .pro file.

Change-Id: Ia8b10481b4235a89dae6d8df2b0320efb88ed1dd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-05-09 08:34:41 +00:00
Leena Miettinen
82d928d189 Doc: Describe Move Component Into Separate File dialog
This refactoring action can now be performed from the Form Editor
of Qt Quick Designer. It opens a dialog for specifying which
properties should be set in the original component and which in the
new one.

Change-Id: Ic076ddc2748a5da38c746b64eac943ec5adbbbf5
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-05-08 08:16:14 +00:00
Leena Miettinen
f412a9b2e2 Doc: Add a link to the Qt Quick Controls 2 - Flat Style example
Change-Id: I3e38759dddb83202d14e40d2392a3e796c799bfa
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-05-08 08:16:00 +00:00
Leena Miettinen
872598747f Doc: Update info about Qt Quick Controls 2 support and styling
Replace duplicate information in the "Creating Screens" topic with a
link that poinst to the new "Using Qt Quick Controls" section in the
"Creating Components" topic.

Add information about selecting styles on the toolbar.

Change-Id: I6c79b8781c216355427920a38542017f0dbf9929
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-05-05 09:48:23 +00:00
Leena Miettinen
3b901b25a8 Doc: Describe changing QML type of item in Qt Quick Designer
You can now change the type of an item by double clicking
the Type field in the Properties pane.

Change-Id: Iacd70a595d693eb83d1b6d9fbfdf38429fd2706b
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-05-04 06:44:19 +00:00
Leena Miettinen
66a22bb608 Doc: Describe the new toolbar in Qt Quick Designer
Some regularly used context-menu items can now be selected
on the toolbar. Some of the icons are constructed at runtime,
so images are needed for them. Some are in a new location that
has to be added to the configuration file.

Change-Id: Ibfc38ec21ed5526702abf89e64899efa5b978700
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-05-04 06:44:03 +00:00
Thomas Hartmann
69ec8054a6 Adjust documentation for QMLPROJECT
Change-Id: Ibb80bf3d966f67577bcfcb499c9dfa5cac405129
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2017-02-28 09:34:09 +00:00
Eike Ziller
1704c484a8 Merge remote-tracking branch 'origin/4.2'
Change-Id: I9006dd493707ae626ae3502541599c8789e1aab0
2017-02-27 15:17:37 +01:00
Leena Miettinen
ffeddec94e Doc: Fix menu item name
This was changed back in the UI, because Stacked Container
is reserved for Stack Layout actions.

Change-Id: Id9fdf3ee6e36bdaa9afde492cfd60074d56da041
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-02-21 15:45:31 +00:00
Leena Miettinen
5c8b6f8a08 Doc: Use "build for", not "build on", because it is misleading
Change-Id: I78e00bda752780c238f46d58f1821c7d7d616436
Reviewed-by: hjk <hjk@qt.io>
2017-02-21 14:05:08 +00:00
Leena Miettinen
fb9cbc2edd Doc: Describe selecting the build system in project wizards
Change-Id: I853676d922ee688385cecb1e498bc4ea2c66fc04
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-21 13:52:22 +00:00
Leena Miettinen
431dd18bc5 Doc: Describe managing stacked containers
Change-Id: Iee2c24067928e20abbaee3e8b3eff2b2106ba384
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-02-21 11:36:47 +00:00
Leena Miettinen
4fb3cd36eb Doc: Describe Edit Color context menu command in Qt Quick Designer
Change-Id: Icd792f3de1872e6d3f1fe50608b2f81189174bb5
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-02-21 11:36:32 +00:00
Leena Miettinen
97d517b116 Doc: Edit info about managing states in Qt Quick Designer
- Describe expanding the State pane.
- The empty slot has been replaced with a + button.
- Do not call the circle menu a "context menu", because there
  is a separate context menu.

Change-Id: I4bc689fd6490bc171891135b2c9f5bd67f9931ba
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-02-21 11:36:21 +00:00
Leena Miettinen
b1a7731c46 Doc: Describe the qsTranslate() option (Qt Quick Designer)
Change-Id: I7033f683f86157830addf1b403baab0379f631c7
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-02-21 11:36:05 +00:00
Leena Miettinen
95e8f82914 Doc: Fix \include command target
If the whole file is included, the copyright statement is printed
in the HTML file (and we don't want that).

Change-Id: I341c658182745facd000c6ad7ce073c1a37caded
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-02-16 13:24:16 +00:00
Eike Ziller
e724934393 Merge remote-tracking branch 'origin/4.2'
Conflicts:
	doc/src/qtquick/creator-tutorial-create-qq-project.qdocinc
	doc/src/qtquick/qtquick-creating.qdoc
	doc/src/qtquick/qtquick-uiforms-tutorial.qdoc
	share/qtcreator/welcomescreen/qtcreator_tutorials.xml
	src/plugins/git/gitgrep.cpp
	src/shared/qbs

Change-Id: I6f4d168d888d9547c3af0819f79cc9ebb4186ca0
2017-02-14 15:32:04 +01:00
Leena Miettinen
37891d92bc Doc: Remove Qt Quick UI Forms example and tutorial
It uses types that do not exist in Qt Quick Controls 2, and
Qt Creator version 4.3 no longer has a wizard for using the
older controls.

Change-Id: I42884ca75eefe957493fcb47d6b243a93341b79c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-02-14 07:50:51 +00:00
Leena Miettinen
6e87ebfe83 Doc: Setting qsTrId() call as default in Qt Quick Designer options
Change-Id: I36f696ea00f87787094d01423ef6308d208012a7
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-02-13 12:44:41 +00:00
Leena Miettinen
c3608ec7e0 Doc: State that Qt Quick Projects cannot be deployed to mobile
...or embedded. Suggest creating an application, instead.

Task-number: QTCREATORBUG-17708
Change-Id: I6b5b1f26bde0d281f162bc68d5cb9088e8fc79cd
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-02-13 10:11:00 +00:00
Leena Miettinen
3858d4c363 Doc: Add licenses to .qdocinc files
Change-Id: Ia20fe2605a6255af24d4334d8289531aaa262511
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-02-13 08:14:53 +00:00
Leena Miettinen
195c7711cb Doc: Add links from Qt Quick tutorials to UI design overview
...in Qt docs. Because a user felt the information is missing.

Change-Id: I76a7820974073651e6632b0f8e705655377b92c0
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-08 08:26:21 +00:00
Leena Miettinen
6f2c120d1c Doc: Describe changes in the Qt Quick Designer UI
The canvas area now contains Form Editor and Text Editor tabs.
Further, the Properties view can be split to show any view, so
there are now two sidebars.

Change-Id: Ib921a806178606a76d584440e2308d504a297fcb
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-08 08:26:04 +00:00
Leena Miettinen
6417865af6 Doc: Write QML in upper case
Change-Id: I42e26b8f6dd38eaefb801fc7c33cb2532fa64df7
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2017-02-07 15:56:44 +00:00
Leena Miettinen
7f1a71ede4 Doc: Update Qt Quick app tutorial
The wizard and UI have changed.

Change-Id: I43d9101abdcfec362746b069509293df2317ae99
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-07 14:55:08 +00:00
Leena Miettinen
8f53c02296 Doc: Describe Qt Quick Designer Form Editor and Text Editor tabs
Users can now use the code editor within the Qt Quick Designer.

Change-Id: I2ad30bafc4b61ce9c1115c9a8b1c019d2b21151e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-02-07 08:39:20 +00:00
Eike Ziller
6244168202 Merge remote-tracking branch 'origin/4.2'
Change-Id: Idd63494e3878dbf8811c35beb957562255d83813
2017-02-06 14:52:37 +01:00
Leena Miettinen
8e536a3b01 Doc: Update descriptions of Qt Quick wizards
Qt Quick Controls Application, Qt Quick UI, and Qt Quick Extension
Plugins wizards have been removed from Qt Creator.

Change-Id: I30e6e59e38d7f120d35f6cf34603d4ec356a5ef4
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-02-06 09:57:36 +00:00
Leena Miettinen
0bbd1e3ca6 Doc: Setting QML import path when using CMake
Change-Id: I7e29f86d2b429fadaad763fa6abe371f79669d75
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-03 15:39:36 +00:00
Leena Miettinen
6175b2f404 Doc: Update accelbubble example to use Qt Quick Controls 2
Change-Id: I946e9cb31517f602ce07fe1967a87bfdf9bd79b0
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-16 16:08:56 +00:00
Leena Miettinen
73e4859c00 Doc: Remove descriptions of Qt Quick Controls 1
Support for the Qt Quick Controls 1 has been removed.

Change-Id: I6fc64cea94ee64cabb19935124bb9e8fdc3d1089
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-12-06 09:10:39 +00:00
Leena Miettinen
91a82fe8b2 Doc: Describe and link to Qt Quick Controls 2
Remove info about Qt Quick Controls 1.

Change-Id: I25f4915cc33df1bca010900ba8d07ed6cc21f207
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2016-11-30 14:36:09 +00:00
Leena Miettinen
1d28a2c4ff Doc: write QML type names as they appear in the UI
Use the \l command where links are needed and normal text or
the \uicontrol command, otherwise.

Change-Id: I5da25819dcd051d3a06d48a08964a6e9052bd22a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2016-11-28 13:30:46 +00:00
Leena Miettinen
8399fe1416 Doc: Fix ambiguous links
Use the [QML] specifier to make sure that the links lead
to QML type documentation.

Change-Id: I93afda14a72cdfe5e941378e332f66bdfe131352
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
2016-11-28 12:53:49 +00:00
Leena Miettinen
75c5afef48 Doc: Setting when property for state in Design mode
Change-Id: I3462f7c5a8ea436d979c12bc02ae1e2f063eeb4b
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-10-31 07:57:48 +00:00
Leena Miettinen
1562ec7bce Doc: Using code completion in Binding Editor in Design mode
Change-Id: I4889d6d247f6d8d8cb758c65eea917736f33262d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-10-28 14:11:31 +00:00
Thomas Hartmann
6dec313692 Document QML_IMPORT_PATH and QML_DESIGNER_IMPORT_PATH
QML_IMPORT_PATH has never been officially documented and
QML_DESIGNER_IMPORT_PATH was added recently.

Change-Id: I932445404a185286d8f03077df492a34db9b0ea6
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2016-10-25 08:29:00 +00:00