Commit Graph

1338 Commits

Author SHA1 Message Date
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
2611002463 Doc: Remove link to removed tutorial
Change-Id: Icfc111addf4e9e69d29325275ef997a7f923b1ca
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2017-02-22 08:49:01 +00:00
Leena Miettinen
0ae475f03b Doc: Clean up links to previous pages
Change-Id: I4352760bfce5637905c432a90f77242d4ad4a668
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2017-02-22 08:47:14 +00:00
Leena Miettinen
cb8753d093 Doc: Clean up the TOC
Some titles changed, but were not fixed in the TOC.

Change-Id: I2e031e4ac89ea34ee8f385cffadf9cb880db7ce0
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2017-02-22 08:42:59 +00: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
20a16ef91c Doc: Move Qbs information into the generic sections
Describe build settings for all build systems in the generic topics
(using .qdocinc files) and keep only configuration in the Qbs specific
topic.

Change-Id: I80ff4cd2fc18339f9c07b0a0cb09bda86e8b61cd
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-02-21 13:51:24 +00:00
Leena Miettinen
fd54b5bbaf Doc: Move CMake information into the generic sections
Describe build, run, and deployment settings for all build systems
in the generic topics (using .qdocinc files) and keep only configuration
in the CMake specific topic.

Change-Id: I334d7488b32aba90ee1e4ca898a65438b9d304a4
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-21 13:50:43 +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
e8c31158aa Doc: Describe adding Nim Compilers
Change-Id: Ia6ab5c409ae58ae1c7dfd77fd20679dad9266f82
Reviewed-by: Filippo Cucchetto <filippocucchetto@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-08 12:16:24 +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
5250ed4bbc Doc: Fix breakpoint trigger in Qt Quick debugger tutorial
Task-number: QTBUG-58686
Change-Id: Ib50d6679655c1eb8a1b6ff60fbfa743446749827
Reviewed-by: Julien Gueytat <contact@jgueytat.fr>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2017-02-07 12:36:04 +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
f76227fa50 Doc: Describe the "New Session Name" dialog
A developer found the options in the dialog confusing.
Also reorganized the "Managing Sessions" topic for
the new text to fit in.

Change-Id: I5bbe0e2bed91ab5759c7d58d0086352ac4ab3751
Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-06 13:41:24 +00: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
e929cc59f5 Doc: Describe the resource editor
This far, it was only briefly described in a widgets tutorial
and the information is needed when using Qt Quick Controls 2.

Change-Id: Ib80a446277e58dbaed9c6a5ac249e2183dc5f63e
Task-number: QTCREATORBUG-17670
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2017-02-03 13:47:27 +00:00
Orgad Shaneh
5159c3f20e Debugger: Add a missing underscore in the docs
Missed in c2e69f7cfb.

Change-Id: I5633dddba21e4b2db5c0300183b791f352af96c3
Reviewed-by: hjk <hjk@qt.io>
2017-02-03 13:45:51 +00:00
hjk
c2e69f7cfb Debugger: Add some examples of dumper function names
Change-Id: I898f8a7dafbca3beb6fdba9c93350b0488973a46
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2017-02-03 10:08:14 +00:00
Leena Miettinen
2ae989479f Doc: Fix icon filename from icon-pan.png to pan.png
Change-Id: I2d0ff2a480f76fc8e2a84d19d3c3ae5e6cb7819d
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2017-02-01 09:14:03 +00:00
Eike Ziller
20670d62ba Update requirements to GCC>=4.9
Change-Id: I34b5dcec552c0af0ce7184a43fa7fba4a75415c4
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-01-30 08:19:29 +00:00
Leena Miettinen
f1456d3fd4 Doc: Clarify that the Projects sidebar view is a build system view
Change-Id: I7f8f06611cb5bb525d8ec7eb72a74fe926b7e599
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-01-17 14:14:59 +00:00
Eike Ziller
dd438a3445 Merge remote-tracking branch 'origin/4.2'
Change-Id: If7e8fbfeae064c95e412b4cfa4804f7aa732be67
2017-01-17 14:03:37 +01:00
Leena Miettinen
3ac78c5053 Doc: Update info about supported platforms
To match the info in README.md and Qt for Device Creation docs
(http://doc.qt.io/QtForDeviceCreation/qtee-installation-guide.html)

Change-Id: I9abd9808aad5fec5bee39204e7b4b0b43656141c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
2017-01-17 12:59:46 +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
8daa7cc6e6 Doc: the Auto Test plugin is enabled by default
It is no longer experimental.

Change-Id: If6fefc0ebe04289a1049086ffcc8f84532ae6ab1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-12-16 09:29:36 +00:00
Eike Ziller
a6b34bd38b ClangCodeModel: Make DisabledByDefault instead of Experimental
Update documentation accordingly.

Change-Id: I3309815ce23cfa8c941717883a7e0e312b7d9a5f
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-12-16 08:56:32 +00:00
Eike Ziller
c175f1e62f Merge remote-tracking branch 'origin/4.2'
Conflicts:
	src/plugins/ios/iosdevice.cpp
	src/plugins/ios/iossimulator.cpp
	src/plugins/projectexplorer/projectwindow.cpp
	src/plugins/qmakeprojectmanager/librarydetailscontroller.cpp
	src/shared/qbs

Change-Id: Ie98e2401a2259903141a13170c78388f2da467d2
2016-12-09 12:42:01 +01:00
Leena Miettinen
fb147ef27b Doc: Update info on Beautifier options
Clang Format options differ somewhat from the Artistic Style
and Uncrustify options.

Also, the "Format entire file if no text was selected" is enabled
by default and also applies to Uncrustify.

Change-Id: I19d6badbd71275a185894e8c5dff96826d378afb
Reviewed-by: Lorenz Haas <lorenz.haas@histomatics.de>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2016-12-06 16:15:05 +00:00
Leena Miettinen
71b27b0d8b Doc: Describe the Import button in Projects mode
Update screenshots.

Change-Id: I9bffcb3689ef4d4a4cd55161bb73ba6d25224710
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-12-06 14:15:29 +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
a9b5e518d0 Doc: Try to make the Projects mode sidebar docs clearer
After receiving user comments.

Change-Id: I525aba5121f0ce629838fa5146f44120283c7f12
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2016-12-02 10:28:16 +00:00
Leena Miettinen
1db1efa271 Doc: Describe excluding large files when indexing
...in Tools > Options > C++ > Code Model.

Change-Id: I8efda2f62a4efd5c782cc4460a3b0c3eebbd23a6
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-12-02 09:57:23 +00:00
Christian Kandeler
ce5b08d9df User docs: Describe the "Force probes" checkbox in the qbs build step
Change-Id: I467bd9bb518e38d714edf535a6e2eb6e805a6708
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-12-02 09:53:49 +00:00
Leena Miettinen
6286d31da3 Doc: Fix typo "where" > "were"
Change-Id: I0dcbccfcbf29249149807c04f072d83fa503a895
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2016-12-01 15:13:27 +00:00