Commit Graph

36 Commits

Author SHA1 Message Date
Leena Miettinen
81bc007ddd Doc: Describe version control system preferences
Task-number: QTCREATORBUG-28721
Change-Id: Ib4d1899885012af5eac176fd53e5536f69a2689b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-03-14 07:29:06 +00:00
Leena Miettinen
738819ec71 Doc: Replace "provide" with something simpler
This follows the ComplexWords rule in vale.

Change-Id: I99d8e5dc3ee4736a254064b6ef00166419fccee8
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
2023-02-06 11:09:29 +00:00
Leena Miettinen
ce0f48e0f9 Doc: Replace "contain" with "have" to simplify language
This follows the ComplexWords rule in vale.

Change-Id: Ie5dbb7ac1eff1546dcfbe2bf5da6cc3ed18b7a20
Reviewed-by: Andreas Eliasson <andreas.eliasson@qt.io>
2023-02-03 15:06:17 +00:00
Leena Miettinen
c5ea756027 Doc: Integrate Fossil docs to the manual
Now that the plugin has been moved to the qtcreator repository.

Change-Id: Iacf6c58765a10f5ad574688dc7ad917f6a705a14
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-01-31 15:33:03 +00:00
Orgad Shaneh
128b21c959 Fossil: Import from super repo
git-subtree-dir: src
git-subtree-mainline: e20bdfae4d
git-subtree-split: c8b9e4504e

Change-Id: Id0c0ed8c57739cba2b0a7431f40f8c07fcab493d
2023-01-31 16:26:09 +02:00
Leena Miettinen
be1aa6abed Doc: Fix typos
Change-Id: I22b610a6dcab73867f915f877d7b7b844da5dc22
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
2022-11-16 10:39:24 +00:00
Leena Miettinen
60bc856a20 Doc: Describe move detection and hiding date in Git Blame view
Task-number: QTCREATORBUG-27876
Change-Id: Ibf93af9dfcd621bf66ddcf84cbae5d5baa963635
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-11-11 09:44:14 +00:00
Leena Miettinen
b59ad8b0a9 Doc: Use active voice instead of passive voice
This fixes issues found by vale.

Change-Id: Ic3495633cc3aabd000e53b4a4107b9bccde28005
Reviewed-by: Andreas Eliasson <andreas.eliasson@qt.io>
2022-11-11 09:43:32 +00:00
Lucie Gérard
a7956df3ca Use SPDX license identifiers
Replace the current license disclaimer in files by
a SPDX-License-Identifier.

Task-number: QTBUG-67283
Change-Id: I708fd1f9f2b73d60f57cc3568646929117825813
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-08-26 12:27:18 +00:00
Leena Miettinen
89be4d7d17 Doc: Replace "options" with "preferences"
...when referring to Preferences dialog.

Task-number: QTCREATORBUG-27560
Change-Id: I2f41420b0ec5955d84ad715d239209adddff0529
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-07-12 07:30:49 +00:00
Leena Miettinen
98984ec3ba Doc: Describe the GitLab plugin
Fixes: QTCREATORBUG-27559
Change-Id: Ifd04888628c7d87a2348deb906f9dfad609c6163
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-07-01 10:22:25 +00:00
Leena Miettinen
b5066d71b8 Doc: Replace "Tools > Options" with "Edit > Preferences"
The menu was moved and renamed. The Options dialog was
also renamed "Preferences".

Change-Id: I05d187915382b3ce49699d91304cd447c87e2bd6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-06-28 08:32:44 +00:00
Eike Ziller
cd8c4ced81 Merge remote-tracking branch 'origin/7.0'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: Ic02df53b880d0861d9d9ea0df3e0d381ae99f350
2022-03-11 09:50:48 +01:00
Leena Miettinen
09804a65e4 Doc: Do not use the term "Output pane" in docs
When necessary, replace it with "view". When possible,
rephrase to omit the term. Link to descriptions of the
output views.

Update screenshots.

Change-Id: I80ccd12f5a10f221bbea6de994a15ddd07d20842
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-03-09 15:30:36 +00:00
Leena Miettinen
7e4ee37978 Doc: Fix "typos"
Change-Id: Ifc4f6295dad8263a53e4d8b7f1da44415d09b5fd
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-03-01 12:08:24 +00:00
Leena Miettinen
85e9a7a9c2 Doc: Describe filtering Git log by author and toggling colors
Task-number: QTCREATORBUG-26610
Change-Id: I72abb044d6ab54f83b76b72b34b500ed5ea8c47d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-02-07 07:55:13 +00:00
Eike Ziller
d422b408e0 Merge remote-tracking branch 'origin/6.0'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: I32991a77e52831dd2e24cf4a51ec252998c2d743
2021-12-09 12:04:32 +01:00
Leena Miettinen
eae031df4a Doc: Copy icons from sources to \doc\qtcreator\images\icons
- Fix the paths to them in .qdoc files
- Remove paths to source folders from .qdocconf files

This is the second step towards making the icons visible in both
dark and light online doc modes.

Task-number: QTCREATORBUG-26644
Change-Id: I6995ea716df78cf0f285175515d1466ee20e317b
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-12-09 10:44:55 +00:00
Eike Ziller
d097314873 Split "New File or Project" into "File" and "Project" parts
This was non-standard to begin with, and splitting it makes it
possible to have different designs for New Project and New File dialogs
that are more tailored for the different needs (as is done in
Design Studio)

Change-Id: Ie6246e3c3f3527702c4562ec6f8fcbf5fae6c6ad
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2021-12-02 11:02:35 +00:00
Leena Miettinen
05d74d000e Doc: Update information about Git Commit and Amend commit views
Describe the options in the views and add a screenshot.

Task-number: QTCREATORBUG-26278
Change-Id: I434af29f8486b7fa523cca151243a53019e92a42
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2021-11-09 14:24:08 +00:00
Orgad Shaneh
75cff21e42 Doc: Improve description of p4config.txt usage
Fixes: QTCREATORBUG-25041
Change-Id: I05ad3f4dc4e19bec2a4bd6b5049061db55be7d09
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-09-27 10:24:25 +00:00
Leena Miettinen
a6f29a5f31 Doc: Describe porting Qt 5-based QDS projects into Qt 6
Task-number: QDS-4720
Change-Id: If368bb19c98016761fbebfd9c81780dbf5f75705
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-09-22 11:46:29 +00:00
Leena Miettinen
f3d6f7542c Doc: Fix the QDS Manual front page
- Create missing top level topics for Inplementing Applications and
  Developer Topics
- Update Advanced Designer Topics and Help topics
- Fix links to next and previous pages
- Fix TOC and front page (hide missing topics and remove NEW markers)

Fixes: QDS-4503
Change-Id: If4ab683bf4628de73c0b37e2c0c69859e1e99f13
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
2021-09-07 09:12:05 +00:00
Leena Miettinen
baf222af3f Doc: Describe creating QRC and RCC files
Fixes: QDS-4566
Change-Id: I1a1e95e64f5196776d2205d66d59120e8d3412d7
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2021-07-02 14:18:11 +00:00
Tasuku Suzuki
3bd490acdb Improve grouping and order in the build menu
Build related menu items are sorted by tasks, then configurations.
e.g.
+ Build
  + Build All Projects
  + Build All Projects for All Configurations
  ...
  + Rebuild All Projects
  + Rebuild All Projects for All Configurations
  ...
  + Clean All Projects
  + Clean All Projects for All Configurations
  ...

This patch changes the order to configuration > task like below

+ Build
  + ...
  + qmake / cmake
  + -
  + Build All Projects
  + Deploy
  + Rebuild
  + Clean
  + -
  + Build Project
  + Deploy
  + Rebuild
  + Clean
  + -
  + Build Subproject
  + Deploy
  + Rebuild
  + Clean
  + -
  + Build File
  + -
  + Build All Projects for All Configurations
  + Rebuild
  + Clean
  + -
  + Build Project for All Configurations
  + Rebuild
  + Clean
  + -
  + ...

Change-Id: I95844e51d2ae164ed9f29fdb1c51509611c514fe
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-25 14:57:37 +00:00
Leena Miettinen
2e0e0df290 Doc: Add info about Merge Tool menu item visibility
Tools > Git > Git Tools > Merge Tool is visible only when
the user has a merge conflict to resolve.

Change-Id: I1c08dae329152726139d075b03a98875b789e154
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-08-20 13:29:31 +00:00
Leena Miettinen
e15d457c18 Doc: Describe starting git bash
Change-Id: If8098f89240f6fdf655adce31734ca847bfec14b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-08-20 13:25:55 +00:00
Leena Miettinen
a8cfe3d560 Doc: Fix menu paths to submenus and items that moved to View menu
The Views and Workspaces menus as well as some menu items were moved
from Windows to View.

Change-Id: I2e196c09f0e9e2bf8ef1623167ec3e87ed1f77f5
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-06-30 10:35:07 +00:00
Leena Miettinen
a8c70ecfef Doc: Link to Fossil Plugin Manual from the version control topic
Change-Id: I58e550aa71571e2b91213edb86d5cdb5403761b2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-05-27 12:12:09 +00:00
Leena Miettinen
c370d345f1 Doc: Remove obsolete \contentspage command
This prints a QDoc warning when building with QDoc 5.15.

Change-Id: Id6f4646738f3e09956a243dc0da639f5567470f3
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
2020-05-11 08:43:31 +00:00
Leena Miettinen
3f513799b4 Doc: Update info about using Git
Update text and screenshots.

Task-number: QTCREATORBUG-23364
Change-Id: Id936d35374fca7ababbbfa35fef507d1cc371786
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2020-04-14 13:02:37 +00:00
Eike Ziller
708f84cce8 Doc: Fix style for menu hierarchies
Use \uicontrol for the individual components individually

Change-Id: Idf62db7c37e94a55a988792f13aaa8c49cb1ac07
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-04-03 06:10:16 +00:00
Leena Miettinen
40899c7209 Doc: Describe changes in the diff editor
- Describe the context menu commands in the diff editor
  when used with Git
- Make the description of colors less specific, because they
  depend on the theme
- Use "chunk" consistently instead of "hunk"
- Update the screenshot

Change-Id: I6c9ec4eee8ff80f171558c930e5e448ac493f927
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2020-03-03 12:34:08 +00:00
Leena Miettinen
da5d53b89b Doc: Document the Restart Now button that appears when needed
Typically, when users enable or disable plugins.

Change-Id: I1d9588e662613d6c061756d247bf12f7c1ace4ba
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-26 16:15:21 +00:00
Leena Miettinen
4cd4316a16 Doc: Replace "pane" with "view"
...for anything listed in Window > Views, except "Output Pane".

Task-number: QTCREATORBUG-23582
Change-Id: I1a46de22657dd5779d693a5078b5aca8b1b57a37
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-02-26 08:10:19 +00:00
Leena Miettinen
5fc456dd22 Doc: Rearrange files in the doc folder
Source and configuration files for each manual are now located in a
separate subdirectory, with common configuration files in doc/config.

doc
|_config
|_qtcreator
|_qtcreatordev
|_qtdesignstudio

Edit the config files accordingly.

Change-Id: Idc747a7c16e84f3e06add91234dc5fc908e64cc5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-01-27 09:05:07 +00:00