Commit Graph

4817 Commits

Author SHA1 Message Date
Eike Ziller
b3ffd8d1eb CMake build: Move documentation functions to re-usable location
Removes "install_..._docs" and "clean_docs" special targets.
Instead install documentation with "--install . --component qch_docs"
and "--install . --component html_docs" which have the advantage that
the install prefix can be specified later on with --prefix.
Also removes export of IDE_SOURCE_DIR, which is not used.

Change-Id: I4fce0b9aa8c7fc40b7e94e065777ddf4c0b76c41
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-05-25 11:31:06 +00:00
Eike Ziller
e7b319fbc1 Doc: Fix naming of .index files
Qt Creator Manual and Extending Qt Creator had the same project name,
and therefore the same index file name.
Also qdoc's "depends" configuration requires the index file to have
the same name as the directory.
Adapt the project names accordingly.

Change-Id: Ie1ec8ede360e19e3ffd5c7dbea44344f0a631f68
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-05-25 08:50:54 +00:00
Leena Miettinen
99dde07495 Doc: Update information about supported devices
Change-Id: I17aed738f147dedee69acaa9c3794394f92d12d3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-05-20 08:11:28 +00:00
Eike Ziller
8292807e0d Merge remote-tracking branch 'origin/4.12'
Conflicts:
	src/plugins/android/androidextralibrarylistmodel.cpp

Change-Id: Ica69c24e83deff819e640dcb4c2682a554d8a2d2
2020-05-19 15:23:16 +02:00
Leena Miettinen
625a8f3eca Doc: Fix typo "sependencies" > "dependencies"
Change-Id: I1d3f3f0bbdcff3d557038d8feca5ffe234d58314
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-05-18 11:37:42 +00:00
Topi Reinio
73d45a994b Doc: Ensure QDoc finds Qt Design Studio examples
The name of the example project directory must match with
the project file name and the \example command argument.
This is case sensitive on platforms other than Windows.

Change-Id: Ie6fa6934ee444b42f024ebf00d6a9b20dfd6abce
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-05-18 10:15:03 +00:00
Tim Jenssen
aa79d30b83 Merge remote-tracking branch 'origin/4.12' into qds-1.50
Change-Id: Ia70d4b47f578021f29197a22b3e07e792342d05c
2020-05-15 17:20:20 +02:00
Leena Miettinen
37421b342f Doc: Add missing punctuation
Change-Id: If0af93ec6f64fc5c48c33df87cf37b4189dfc72e
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-05-15 14:06:13 +00:00
Leena Miettinen
564bace1ec Doc: Describe SpotLight Qt Quick 3D type
Update screenshots of all light types in 3D Editor.

Task-number: QDS-2056
Change-Id: I5f4fbacd01850c7cedcbd187969b9f310507649c
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-05-15 13:27:03 +00:00
Eike Ziller
52b7ec058b Merge remote-tracking branch 'origin/4.12'
Conflicts:
	src/plugins/mcusupport/mcusupportsdk.cpp

Change-Id: I1583fa81adc0218ad4657baa347c08e9e29f88e6
2020-05-15 14:49:11 +02:00
Johanna Vanhatapio
921b56cd46 Doc: Update information about views for editing 3D assets
Task-number: QDS-2056
Change-Id: Iee6aab42c4cd6d97d99eafc3599e55828f0d9657
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-05-15 09:01:24 +00:00
Leena Miettinen
3819b766a4 Doc: Update information about project wizards
Qt Quick 3D, Flow Item and Flow view wizards have been added,
the Qt for MCUs wizard is now included in Qt Design Studio,
and the font loader wizard has been removed.

Task-number: QDS-2056
Change-Id: Ie5d42320661977d57767c3bf58fd480e7d6c3c8d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-05-15 08:04:05 +00:00
Johanna Vanhatapio
1d257e60d1 Doc: Update information about 3D Editor
Change-Id: I047b96e1db411ccbbe73a94f701cc7e632bc98c9
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-05-15 06:06:26 +00:00
Leena Miettinen
c59e8ce651 Doc: Update information about Scene Environment properties
"Blend mode" field seems to have been removed.
The Skybox option has been added to "Background mode" field.

Task-number: QDS-2056
Change-Id: Ie5c5b5fae4aba83bd8b9b50357bb83d58fbb69c2
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-05-14 14:39:03 +00:00
Leena Miettinen
f51258a17c Doc: Move Qt Bridge product name macros to the common macros file
..from the Qt Design Studio Manual doc configuration file.

Change-Id: Iebbfb5404cae4ef277f05c867e7259997b19a27e
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
2020-05-14 10:18:31 +00:00
Vikas Pachdha
f362304169 Add library export documentation for Sketch Qt-bridge
Task-number: QDS-2046
Change-Id: Idca24fdac106da1b6631518ddd9bb9fa7253a8c7
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-05-13 11:45:46 +00:00
Leena Miettinen
a12669292e Doc: Remove link to non-existing tutorial
Part 5 is still a work-in-progress.

Change-Id: I7c8cd07be3921b9fd36eeb913d9e393e6f15d895
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-05-13 09:49:50 +00:00
Leena Miettinen
bbddd60e03 Doc: Remove extra copies of images that were moved
They are now in doc/qtcreator/images. They seem to reappear
here during merges.

Change-Id: I7dc0b58997996601be7e54fb0a45898f0a5718a7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-05-13 08:06:15 +00:00
Leena Miettinen
b788c70b95 Doc: Update info about States view
Check terminology, restructure information, and update
screenshots.

Task-number: QDS-2056
Change-Id: Ieaa2d0856bf2d310f67d8c0d9f9376a48cf33534
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-05-12 15:06:15 +00:00
Leena Miettinen
b15e19ac12 Doc: Update screenshot of Properties view in Design mode
...and remove the numbers from the image and text, as one can
easily see the item type.

Task-number: QDS-2056
Change-Id: I821db7a0f3a4ff1999c58701f379ae3667821a0a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-05-12 15:04:43 +00:00
Leena Miettinen
795fb5f59d Doc: Update info about QML types supported by Qt Quick Designer
Update screenshots.

Change-Id: If079a93940dc103b4afa283f01c94825d895bfa3
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-05-12 15:04:22 +00:00
Leena Miettinen
99b66f6238 Doc: Update info about managing item hierarchy in Design mode
Task-number: QDS-2056
Change-Id: I0786d01dcde48e056450ea70b498abcdd204e381
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-05-12 07:08:47 +00:00
Eike Ziller
20ef5c6de3 Merge remote-tracking branch 'origin/4.12'
Change-Id: Ibbf9f16677a58bdcdd3ce63701ffa34db6f44916
2020-05-11 11:36:22 +02: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
d86c2a1ba9 Doc: Remove obsolete info about selecting items with content
The button has been removed.

Task-number: QDS-2056
Change-Id: I7495107e68920f02effef0618461f5ed6c88bfa8
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-05-11 06:36:24 +00:00
Leena Miettinen
c1781320f3 Doc: Describe using Alt and Shift modifiers in Form Editor
...when resizing items

Fixes: QDS-2034
Change-Id: I4b4589a19c3c0ca96d6f8a80c7e4a3cc03731690
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-05-11 06:35:59 +00:00
Leena Miettinen
993a628859 Doc: Describe setting initial root item size in Qt Quick Designer options
Task-number: QDS-2056
Change-Id: I82fc86b748d72b180e2e503a7d80754d61682abd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-05-11 06:35:01 +00:00
Leena Miettinen
9179743464 Doc: Fix terms used for Design mode views
The "canvas"/"scene"/"stage"/"working area" is called "Form Editor view".
Library, Navigator, Projects, Properties, States, Text Editor,
and Timeline are also their own views that can be organized as
workspaces and open from the Windows menu.

There are "tabs" only within views, and "panes" refers to
output panes.

Change-Id: I55898eef99b87245e4ab9b0163943725a90615a3
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-05-06 16:27:14 +00:00
Leena Miettinen
937d3d3a70 Doc: Add Qt Design Studio example documentation
From Qt Design Studio 1.4. Add .qdoc and .qmlproject files,
quoted .qml files, and .png files.

Edit the files as necessary to reflect changes in version 1.5
and to reduce image file size.

Task-number: QDS-1519
Change-Id: I3bbdec0d3b4acf904c0008d1566dad13707e9851
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-05-06 16:26:11 +00:00
Eike Ziller
bf490b62e0 Merge remote-tracking branch 'origin/4.12'
Change-Id: I11936ad9e4515c3c6c9df1d949cc8116aeccd4c4
2020-05-06 09:43:20 +02:00
Christian Kandeler
97165f0cb8 CodePaster: Expose privacy setting
Let the user decide whether their pasted content is public. Default is
non-public, for safety reasons.

Task-number: QTCREATORBUG-23972
Change-Id: I5be444807d3f2cb41c629825715f0eaaa50d34c7
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-05-05 12:35:11 +00:00
Johanna Vanhatapio
00200d8b90 Doc: Describe 3D Editor local and global orientation mode
Change-Id: Ibe281ba6d06c68a9c5f36a743563b6fc40fe7e0a
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-05-04 12:24:25 +00:00
Eike Ziller
be73f41ad4 Merge remote-tracking branch 'origin/4.12'
Change-Id: Ib95ec2c50c4bbaefd4ed0ec5af191ccc846c824f
2020-05-04 10:52:34 +02:00
Leena Miettinen
b18587742f Doc: Describe downloading Qt Bridge from Qt Marketplace
Adjust the info about exporting and importing assets.

Change-Id: Ibc66fac68e14483fda050b7501fc7e091115ce89
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-05-04 06:56:22 +00:00
Tobias Hunger
494b9f5287 CMake: Remove servermode support
Task-number: QTCREATORBUG-23915
Change-Id: I2a58e1d6d95c28e25787722fa37448d86c4aebc9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-04-29 14:30:16 +00:00
Christian Stenger
4aa2598790 Doc: Add information on using Catch2 tests
Add information on creating and specifying settings for
Catch2 tests.

Change-Id: I6d658f670aa9c066076cf33315ab17302d9cf36c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-04-29 10:31:07 +00:00
Venugopal Shivashankar
91f696b3f3 Doc: Fix the new project template's group name
Task-number: QTCREATORBUG-23858
Fixes: QTCREATORBUG-23858
Change-Id: If4493b9c5e3b017097c52797f14f3bc507275e61
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-04-29 08:33:44 +00:00
Eike Ziller
e9661e43cb Merge remote-tracking branch 'origin/4.12'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/libs/qtcreatorcdbext/qtcreatorcdbextension.cpp

Change-Id: If6963d1ef7b5a1ea6343f68c8e7ce6fb5f482f21
2020-04-28 15:48:36 +02:00
Christian Kandeler
ab840d0043 Doc: Fix description of how to get to global "lib search path" setting
Change-Id: I7598f91a77c27578f1e6b106f6ae9b0f84481746
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-04-27 09:10:02 +00:00
Eike Ziller
d79febdde9 Merge remote-tracking branch 'origin/4.12'
Conflicts:
	src/plugins/cmakeprojectmanager/cmakekitinformation.cpp

Change-Id: I90ef0063ed24e23bcb3d73fff086f50324faa1e2
2020-04-24 13:58:05 +02:00
Leena Miettinen
aad05dde54 Doc: Fix links in Qt Design Studio Manual
Change-Id: Ie5a218fcdb8ed4823ce8caac655cc3081236f07f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-24 11:23:59 +00:00
Tim Jenssen
081186811d qds: remove workaround when qdocconf was somewhere else
After moving the QtDesignStudio documentation to the QtCreator
repository there is no need for these extra files in the dev
packages.

Change-Id: I4e24946bb6752403a6ecafb0c474332ad2317b1a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-04-24 08:34:16 +00:00
Leena Miettinen
169c3bb30c Doc: Fix path to image files
Change-Id: I8f9395bd5d8c5ae02e1bb994577b02c80c4c2564
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-23 12:42:47 +00:00
Eike Ziller
8984272769 Merge remote-tracking branch 'origin/4.12'
Change-Id: I296a61fe43aea134de9e7a6ee8042af3f45f5e99
2020-04-23 11:09:15 +02:00
Leena Miettinen
7bf3024a56 Doc: Update info about the Timeline view and curve editors
- Remove information about enabling the Timeline view, because it
  is now enabled by default
- Update the screenshot to show the animation curve editor icon
- Show information about previewing, which is now enabled
- Fix UI text for the animation curve editor

Change-Id: I288b45f521945aadf76475871f422ccb41cd1ac1
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-23 06:10:11 +00:00
Leena Miettinen
4df0e1f4af Doc: Add missing dot
Change-Id: I20c6f4709eea0e9e7cbf04401b4499d403deaedb
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-04-22 14:05:32 +00:00
Tobias Hunger
283763a3e2 CMake: Update documentation to require CMake 3.7 or later
Tealeaf mode has been removed, so update the documentation accordingly.

Change-Id: Ibecc2f127f3acb5d6813e4f670c3424db633cacb
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-04-22 11:59:30 +00:00
Leena Miettinen
677fdb78c1 Doc: Fix references to projects-related UI strings
We now have a "Projects mode" and "Projects view",
but "Build & Run" options category.

Change-Id: I5bf1829cb3f9bd47bbbf06c5898e3efd417cb796
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-04-22 07:28:53 +00:00
Leena Miettinen
f21f7e97fc Doc: Move information about using Form Editor to separate topic
Rewrite information about the Qt Quick Editor to take new
workspace concept and 3D editor into account.

Task-number: QTCREATORBUG-23364
Change-Id: I053685b5e603ad75af3f7314c30e627fac5c6207
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-22 07:12:30 +00:00
Leena Miettinen
6c8c501d6b Doc: Update screenshot of kit debugger options
To use the Design theme.

Change-Id: I2b25bc7d3baf51b3430b0aaff848a2be8e180540
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-04-21 10:49:42 +00:00