Commit Graph

55 Commits

Author SHA1 Message Date
Leena Miettinen
e768a63af1 Doc: Add link to the Qt Quick Controls customization reference
Change-Id: I2eb4e63a7b6ac13c16272a7b5db2f0d07a4e9382
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-07-17 10:38:40 +00:00
Leena Miettinen
7ae91977c3 Doc: Use [QtQuick] as module identifier for QDoc instead of [QML]
The latter does not seem to work, after all.

Change-Id: Icade96a0810b73a85d35532d394c09f6f703a3a8
Reviewed-by: Martin Smith <martin.smith@qt.io>
2019-05-14 14:04:52 +00:00
Leena Miettinen
ee68989e2a Doc: Add anchor button images and use them in the docs
Also needed in the Qt Design Studio tutorials.

Change-Id: I3efe391660480b02d010327afd583070b1fa1a33
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-04-26 07:47:41 +00:00
Leena Miettinen
9ac0ae18d6 Doc: Use "screen" only to refer to physical screens
Replace with "UI", "view", or "parent" or leave it out, depending on
the context.

Change-Id: I319d173d5db45380f8b940701ca1b1e5e9753065
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-04-16 14:32:27 +00:00
Leena Miettinen
11d7baf97d Doc: List Animated Image as a QML type supported in Qt Quick Designer
Change-Id: I3eefe1d70200801639112fb961a1c5c9d6fe161d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-04-09 07:16:09 +00:00
Leena Miettinen
aacac48908 Doc: Replace "Qt Quick Controls 2" with "Qt Quick Controls"
- Qt Quick Controls 1 has been removed and most link targets have
  been changed
- Leave some link targets where links would break
- Leave strings that still have the "2" in Qt Creator
- Remove the obsolete dependency (QDoc complained about it)

Change-Id: I05148df3b07b4499f802557252c028b11ca29213
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-04-09 07:15:56 +00:00
Leena Miettinen
a6fe2999db Doc: Show the User Interface topic in Qt Design Studio Manual
The topic was added to the Getting Started section, so the
navigation links were changed.

Also, the topic that describes the Design mode was moved to
Getting Started.

There is a respective change in the Qt Design Studio repository.

Change-Id: I5b9d85e06be089924fccba8264a669eaeb258249
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-04-01 09:45:56 +00:00
Leena Miettinen
c162127bca Doc: Describe Dialog type from Qt Quick Dialogs module
It is now supported by Qt Quick Designer in the Library.

Change-Id: I2aec818651d02409f6158a47ab81722db7045f08
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-03-27 14:04:45 +00:00
Leena Miettinen
4401749e85 Doc: Fix menu paths to the positioners and layouts
Change-Id: I5a03596ef5cb07dc09144f19eb68b79445169081
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-02-21 08:14:11 +00:00
Leena Miettinen
da01512676 Doc: Replace "Nut menu" with "Settings menu"
Change-Id: Ie53abecac566fbd69023572390fabf5db40fbec3
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2019-02-20 16:18:02 +00:00
Leena Miettinen
ac382b68b7 Doc: Show button examples also in Qt Design Studio Manual
Use defines to display the correct menu paths to the wizards.

Change-Id: I2cd6dff049a674e9646639fa928f7353d97037ac
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-01-30 14:00:45 +00:00
Leena Miettinen
0ece50d788 Doc: Add info on Qt Effects to Qt Design Studio Manual
The include file is located in the Qt Design Studio
repository.

Change-Id: I37ba095a056bf7f83ddd778615f1d95f7bb1db14
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-12-04 09:08:03 +00:00
Leena Miettinen
3b2a7c0b52 Doc: Reflect changes in Qt Design Studio Manual structure
Change-Id: I811c8715e02e8013c7e34c6dbf0b7a1e60205383
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-08-27 09:47:50 +00:00
Leena Miettinen
9550f3ac95 Doc: Use defines in "Creating Components" to view and hide info
For single-sourcing Qt Creator Manual and Qt Design Studio Manual.

Change-Id: Ic771280121d56d11bcc8eccd7edbf0b4bc72eefb
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-08-23 10:52:51 +00:00
Leena Miettinen
8828d79c4a Doc: Use defines in navigation links
To be able to build Qt Creator Manual and Qt Design Studio Manual
from the same sources.

Change-Id: I6adbc7b7f23c40f24508a8de7ae9ad5a2a3a103e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-08-16 14:48:46 +00:00
Leena Miettinen
ac674bac03 Doc: Describe newly supported Qt Quick Controls 2
Support for several controls has been added to the Library in the
Design mode.

Change-Id: I9822f7379991eea3b32f47574e3c3548445d538d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-07-19 14:00:48 +00:00
Leena Miettinen
41493d24f0 Doc: Replace title with HTML filename as value of \contentspage
To make links work if the title changes.

Change-Id: Icf516e74c68efc3b26689aaec27f28ee7ae51ce3
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-07-12 08:27:01 +00:00
Leena Miettinen
f18d2ded9b Doc: Move information about Qt Quick Controls to "Creating Components"
Move the topic up in the hierarchy. Will remove "Creating Screens" in
a follow-up commit.

Change-Id: I0de2bdc4706ab0cce13f5772006126b291e76b97
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-07-11 12:24:44 +00:00
Leena Miettinen
7201b26a52 Doc: Pull out "Adding States" into a separate topic
To further modularize the Manual.

Change-Id: I9b51ce951b92ff6690780de3d9f08f436169150d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-07-03 12:54:25 +00:00
Leena Miettinen
e2e55a2f88 Doc: Replace "Qt Quick Designer" with "Design mode" or \QMLD
To make source text usable also for Qt Design Studio manual.

Change-Id: I7a5090ea2308a3091c34193cce3a8b57da1eb498
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2018-06-25 15:48:15 +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
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
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
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
Tim Jenssen
3b503d87f2 Doc: remove Qt Labs Controls advices
It was just a testballoon and they are living as
Qt Quick Controls 2 in newer Qt versions.

Change-Id: Ic65a7af0866be5e1427e3165ab588ee28c2db051
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2016-09-30 13:28:18 +00:00
Leena Miettinen
ecbd1fa408 Doc: Update creating components and screens with Qt Quick Designer
Add dependency to the Qt Quick Controls 2 docs

Change-Id: Idcbb856cf38d8867dc781ade572cf18f87983912
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-07-29 12:10:13 +00:00
Leena Miettinen
f3fab4423f Doc: using Qt Labs Controls
- Describe the wizard
- Mention Labs Controls besides older Controls

Change-Id: Ib9182c5ebc9c8ee4478018dd5ef29841284eb3de
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-03-23 08:20:21 +00:00
Tobias Hunger
43800a6aa8 Update License according to agreement with Free Qt Foundation
* Update license in documentation files. Stay at FDL, but update
  URLs as well as license for examples, etc.

Change-Id: I5e8cb5a20f0e9d52fba1d937b7c73197d69dd747
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-19 13:09:03 +00:00
Leena Miettinen
1ed73ea36c Doc: fix links to previous and next pages
...for moved pages

Change-Id: Ic52376b73687676c0e09fefc5a53f10c328c18c8
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-11-19 15:39:12 +00:00
Leena Miettinen
271c6cf6db Doc: mention Qt Quick Extras in "Creating Components"
Change-Id: I9f816084e24d887a6fca5abb3689347156a26558
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-10-27 14:48:15 +00:00
Eike Ziller
3c85058694 Update License
Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2015-01-16 12:37:56 +01:00
Leena Miettinen
e1fbeedcd4 Doc: use \uicontrol command instead of \gui macro
Change-Id: Idc898b6ac70b6d3186d353086b5f3e45830d1f83
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
2014-12-12 10:26:59 +01:00
Leena Miettinen
dffd2866b3 Doc: add missing info about sidebar views in Qt Quick Designer
As it turns out that we have a sidebar also in the Design mode,
with partly the same views as in the Edit and Debug modes, I
added info about the missing views and fixed the terminology.

Change-Id: I997d472548781a466bec3e64dbf28ecb1476b3eb
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-12-04 12:36:28 +01:00
Leena Miettinen
953d688d88 Doc: add info about Qt Quick Dialogs and Layouts
Task-number: QTCREATORBUG-12721
Change-Id: Ib6ff3e53806be26f714378d4ffcd3b54a36a6e8f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-07-30 13:08:08 +02:00
Topi Reinio
627e2b4807 Doc: Use the page title for linking to index.html
Because the Qt Creator documentation depends on Qt reference
docs for linking, qdoc will generate a collision page for
index.html as it exists in both.

This change prevents linking to the collision page in the
navigation links by using the page title as the link target
instead of the file name.

Task-number: QTCREATORBUG-11035
Change-Id: I5638e09b60543dc2068b0e4a269f8f72d4655b48
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-03-17 14:53:01 +01:00
Leena Miettinen
7b088afbe9 Doc: don't use the term SDK in connection with Qt
Replace with "Qt distributions" or "installers" or rewrite
in some other way.

Remove references to installing Qt 4 SDK, because it is
no longer available for downloading.

Change-Id: I291f82702e21d953f2efbb0e634d6454b4bc17b9
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-03-14 16:12:10 +01:00
Robert Loehning
746c5d8863 Incremented year in copyright info
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-01-08 08:29:47 +01:00
Leena Miettinen
c0704c2091 Doc: use cross-linking to Qt module documentation
Replace links to "\l{http://qt-project.org/doc/"
with links to topic titles. Remove links where QDoc
creates them automatically based on the .index files.
Add the .index files for the modules that are discussed
in the Qt Creator Manual.

Note: the links will only be generated if the Qt used to
build the docs contains the linked modules and documentation
(.index file) has been generated for them.

Change-Id: Ibe624bf3773e7c854c03ebba4db406be0b4a7b90
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-11-26 11:51:46 +01:00
Leena Miettinen
6074f114b7 Doc: hide Web View QML type
Support for the Web View was temporarily dropped as it
was buggy.

Change-Id: I73f6950b6135133cbc4cb69c952271392e00f9c2
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-11-12 16:15:30 +01:00
Leena Miettinen
d6876873d4 Doc: update path to command to create QML files
The command has been moved to the Qt category.
You can now choose between Qt Quick 1 and  Qt Quick 2.

Change-Id: Ifd75326eb54c01876e4701eba516ace30544822c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-11-12 16:15:20 +01:00
Leena Miettinen
c469964ca5 Doc: remove obsolete \if defined commands
The doc sources are no longer used for single-sourcing.

Change-Id: I934c88c19646d84b4de3c5787234148f947c4489
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-06-19 16:21:42 +02:00
Oswald Buddenhagen
6fb94a7b10 Merge branch '2.7'
Conflicts:
	doc/src/qtquick/qtquick-components.qdoc
	doc/src/qtquick/qtquick-designer.qdoc
	qtcreator.pri
	qtcreator.qbs
	src/plugins/cppeditor/cppinsertdecldef.cpp
	src/plugins/qnx/qnxruncontrolfactory.cpp

Change-Id: I0a37a07c42719bc0d9ef5b3ac4641d01a63c0d88
2013-05-15 10:21:47 +02:00
Leena Miettinen
3c1b5213b5 Doc: Qt Quick Controls in Qt Creator
Describe the Qt Quick 2 UI with Controls wizard and
using controls in Qt Creator.

Change-Id: I95ba128c8dde7e0e117f649f2ff974f2c6ee624c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
2013-05-10 09:53:08 +02:00
Leena Miettinen
dd4bd99c89 Doc: replace "element" with "QML type" or "item"
Try to make terminology more consistent, by using
"QML type" when describing the types, "item" when
describing instances of QML types, and "component"
when describing objects built by using QML types.

Change-Id: Ie03f3a7e6f483471e344ae1f35bec0742173b27c
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-03-13 14:32:47 +01:00
Leena Miettinen
e3587e8f0d Doc: switch fixed links from Qt 4.8 to 5.0
Will look into changing automatically created links in
another patch.

Change-Id: I29b61c5301402c40d9e711762a6b57479088152b
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-03-13 11:08:27 +01:00
Leena Miettinen
419c6de735 Doc: replace deprecated QDoc commands
The \i and \o commands were replaced with \li and
\bold was replaced with \b in QDoc for Qt 5.

The \input command was replaced with \include in the docs.

Change-Id: I257d1bebb8ebc739ca20e0d29fcf0406ecb14534
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-02-06 09:44:18 +01:00
Robert Loehning
298531e370 Incremented year in copyright info
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-01-29 16:27:03 +01:00
Leena Miettinen
8b8d104c58 Doc: where appropriate, refer to Qt 4 SDK
The contents of the Qt 5 installation program will differ from those
of the previous Qt SDK (no tool chains for Nokia mobile devices, for
example). To make this clear, refer to the Qt 4 SDK, where appropriate.

Change-Id: Ia6c3ab5fc3edd150fbe5362f85353243860afdb7
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-10-22 15:38:53 +02:00
hjk
386ca7c8dd Adjust license headers
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-05 17:12:56 +02:00