Commit Graph

86 Commits

Author SHA1 Message Date
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
Leena Miettinen
b7d1be77e9 Doc: Remove dependencies to deprecated modules
To suppress QDoc warnings.

Change-Id: Ic1eb077701d9e9bdcaee63af9af8eaff8d2ec26f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-03-23 12:37:10 +00:00
Eike Ziller
33fa4b401c Create a reusable docs.pri for generating documentation
Since we cannot directly use qt_docs.prf since it contains
various Qt specific details, adapt it for use in Qt Creator.
This can then be used e.g. by plugins that are not part of the
Qt Creator repository.

Change-Id: I87511cad74cbcae5cb58087e9a9386130d635aa9
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-03-09 09:30:42 +00:00
Leena Miettinen
0ed42f1c9f Doc: Move the TOC to a separate page that is used as indexTitle value
This fixes the problem that the whole TOC is not visible in the
Qt Creator Help mode Contents view (because it was generated based on
the \table entries, not the \list entries).

Task-number: QTCREATORBUG-10585
Change-Id: I86607e10db7172b2a7492e4ce1660c39390ef9ed
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
2017-03-09 09:13:27 +00:00
Eike Ziller
461a7483e3 Doc: Remove unused QTC_LICENSE_TYPE define
Change-Id: Iba49e6fc6b1d857cc0f87b5bf833f42a4a8a976f
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2017-03-06 07:46:13 +00:00
Leena Miettinen
d2e99f9e55 Doc: Add docs for SCXML Editor
Change-Id: I563a2a06b101e3954c3365baba4a596ef29517ab
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-10-06 14:05:26 +00:00
Leena Miettinen
1d39d8aba7 Doc: Remove reference to obsolete qtquicklayouts.index file
Add a link to the Layout QML type and fix the name of the import
to stop an autolink from being generated to the wrong target.

Change-Id: Id2ca5e418ea6d254813a20f00b6623ff21dda09a
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
2016-08-19 07:48:16 +00:00
hjk
1e8ffa20d0 Doc: Introduce a macro \macos to adapt to upcoming renamings
Start with an initial value 'macOS' and use in uncontroversial
places in the docs. Some explicit references to older versions
are untouched in this patch.

Change-Id: Ibea4115c45fc2ff2c9a0518d92797df26fd4138f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2016-08-03 15:30:06 +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
2ab466ea04 Doc: Describe model and state chart wizards
Add the Qt SCXML index file to be able to link to the module
docs.

Change-Id: Ibd28071cdc3c98c07fb91c73732d809ffed5333b
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-07-27 14:21:04 +00:00
Alessandro Portale
a6683575c4 Icons: Move "next/prev", "[un]locked" and "zoom" from Core to Utils
They are needed in the timeline view.
The change in qtcreator-project.qdocconf makes sure
that qdoc still finds the referenced icons.

Change-Id: I812fba8e57d06d93efc00c295467c83c08cd1784
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-05-31 08:51:12 +00:00
Leena Miettinen
4021a2a902 Doc: Use icons from source in the manual
This removes the need to take screenshots of icons.

- Add icon source directories for the .qdocconf file
- Remove screenshots of icons from doc\images (except completion
  icons)
- Copy images that do not have unique names from src or libs
  to \docs\images
- Create images that use overlays and update them in docs\images
- Fix paths and filenames in \inlineimage commands
- Fix text where one screenshot was replaced by two icons

Change-Id: Ib98206890bd15a843566de8d709e45487c70dfbd
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-05-03 14:26:35 +00:00
Topi Reinio
4ea8caccf2 Doc: Extending Qt Creator Manual: Fix documentation config
- Add missing sourcedir (../api) to get landing page and other
     documentation generated.
   - Remove invalid sourcedirs (Find and Locator plugin directories
     no longer exist).

Change-Id: I125e86702eaded08de342e103970281984f449d4
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2016-01-26 09:29:27 +00:00
Topi Reinio
4453ed4fc2 Doc: Remove codeindent from documentation configuration
A default indent of 1 was defined for code snippets. It was overridden
by the template, and most likely left there as an oversight. Now, with
QDoc and the templates from Qt 5.6 it does have an effect, and makes
the style look worse and copy-pasting code more cumbersome.

Change-Id: I37a0facd4c03566eaf295a2cc391fa328f50c14d
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-12-09 09:26:15 +00:00
Leena Miettinen
7ed574945a Doc: add docs for ISO Icon Browser
A commercial Qt Quick Designer plugin for
adding ISO 7000 icons to applications from
an icon library.

Change-Id: I96d740d63bc77da9817ce2d5ccdb1625dbc5caa6
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-10-27 14:48:02 +00:00
Leena Miettinen
7dbea56b9c Doc: fix section name in the sidebar in online docs
"Debugging and Analyzing" is now "Testing", because
autotests are also described in this section.

Change-Id: Ied1de78d630e4e7faa39d343475b5e493b5e89c7
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-09-07 13:30:15 +00:00
Leena Miettinen
c4fe977e7c Doc: remove references to Qt WebKit
It has been deprecated and was only used as an example.

Change-Id: I4e483e2f86b32476e4b88c9c3eecb7eeffa42e72
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-08-10 07:39:19 +00:00
Leena Miettinen
b9b1f89ea9 Doc: update the mobile application tutorial
Update text to match the template and UI.

Use the \example command instead of \page to have qdoc
generate HTML files from the example files. This requires
also adding the .pro file.

Add an SVG image to the sources and link to it from the
text.

Change-Id: Ib90798386ee082c9ea2a405b33a4f2a5996a9d2a
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-06-30 07:24:58 +00:00
Leena Miettinen
36173e25ff Doc: add UI Forms tutorial
Based on the Qt Quick Controls UI Forms example.

Change-Id: Iec42b7559161f980e4f482c63bfc40a22f5e77f8
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-06-26 13:10:30 +00:00
Leena Miettinen
db48c49af9 Doc: add a "commercial" icon to commercial-only topics
For purely commercial apps, this is done by using the
template, but Qt Creator is mostly open source, so an
image is used.

Use a \commercial macro with a tooltip and link to the
image.

Change-Id: I5e3df953821551331afef2ec642b482b52ff909e
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
2015-04-08 10:45:50 +00:00
Leena Miettinen
8c472f2074 Doc: experimental Auto Test plugin
Commercial only.

Change-Id: Id2ee9a7765f226c32ec1595e32f4b53ee94d1207
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-04-08 08:13:08 +00:00
Sergio Ahumada
e84770b794 Adapt documentation URL
Change-Id: I74963a9d4a729450341f4f7a4ae5b3583654ffb8
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-02-18 12:38:23 +00:00
Topi Reinio
1679c07e74 Doc: Prepare Qt Creator manual for the qt.io online style
- Add a copyright notice (required for projects external
    to Qt in the new template)
  - Add an .html file with sidebar content

Change-Id: I2c9d965698aa2d2ed01426510b16916ed4fef8cf
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2014-11-24 14:41:20 +01:00
Leena Miettinen
0d9b254840 Doc: remove support for building docs with Qt 4
The templates are fetched from qtbase/doc/global

Change-Id: I15386a66e1dae552f5637062d9f176bf6565a834
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2014-11-24 09:48:26 +01:00
Topi Reinio
ceea1d9f5d Doc: Remove non-existent path from .qdocconf
Path 'snippets' does not exist.

Change-Id: I3cd5a426f4916e7cb5c7868f8bf437de8e59389c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-08-14 15:48:33 +02:00
Ulf Hermann
52ef14190e QmlProfiler: Update documentation
Quite a few things have changed and the documentation should describe
them correctly.

Change-Id: I21a1f81022f21500c069b641744a37eef9eaa6b9
Task-number: QTCREATORBUG-12590
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-07-04 16:14:40 +02:00
Jerome Pasion
026ea56bff Doc: Adding Qt Creator's URL in qt-project.org in qdocconf file.
-can be used for referencing Qt Creator's pages from other
 QDoc projects.

Change-Id: Ifdb82a8995976580876523f5bd6efb688bdfb9b1
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-07-04 14:40:49 +02:00
Oswald Buddenhagen
cee04d9ac6 fix building against non-installed qt5 shadow builds
the global qdoc configs may live in the source dir, but the indexes are
always in the build dir.

this will obviously only work for a non-prefix (developer) build of qt,
as a non-installed prefix build is not usable from the outside.

Task-number: QTCREATORBUG-11919
Change-Id: I268af2f075a098ac5fe788a2f85c754dc6e4e8b0
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-05-27 10:12:52 +02:00
Leena Miettinen
0962c0b03f Doc: remove Qt Simulator macro
The Qt Simulator is no longer mentioned in the docs.

Change-Id: I8730e45c75f2e69dadc053ebfa205aa7b6eef5fd
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-03-14 16:14:05 +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
f7b1dbe92c Doc: point the automatic links to Qt 5 docs
The index files are now fetched from qt5/qtbase/doc.
Removed the qt.index file that came from Q 4.
When building the docs with Qt 4, no links will
be generated automatically.

Change-Id: I0786745f218e4c854e08012664629a7697dcadf3
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-11-06 12:32:03 +01:00
Eike Ziller
e8469a2bab Merge remote-tracking branch 'origin/2.8'
Conflicts:
	src/plugins/fakevim/fakevimhandler.cpp

Change-Id: I8101f18b87859924644471817d4f1408790d5628
2013-06-25 10:14:14 +02:00
Jerome Pasion
72b06779ab Doc: Get Creator and Extending manuals to use new qdocconf variables.
-navigation variables for Qt 5.2's navigation bar
-buildversion is for including specific build information such
 as branch name and patch version

Change-Id: I4d36f1ea73b8c37ab787d154c9fdd91650305bc5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-25 09:49:43 +02:00
Jerome Pasion
ee9c8dafc3 Doc: WS fix in qdocconf file.
Change-Id: I57767dbf8c5af8f2961136cb9a7ca16dab6fcf5b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-06-24 14:20:09 +02:00
Kai Koehne
5bfe37c58c Add documentation for extensions of Qml Performance Monitor
Can be enabled by passing LICENSE_TYPE=enterprise to qmake.

Change-Id: I49044c2425a056980b6e9f8377e6a33c1beaca5a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-06-20 14:52:37 +02: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
Eike Ziller
37e0b91450 Hide internal API when generating API documentation.
Knowledge why internal API was explicitly enabled is lost.

Change-Id: Ie35b31f624be413405bf2f28cf97822aa687bb3d
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-04-03 09:19:18 +02:00
Jerome Pasion
93eaa54ae5 Doc: Removing tracking code from template.
Task-number: QTCREATORBUG-8627

Change-Id: I7d98c15789618a16ebca024cf0a88cc9f19c378a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-03-08 15:28:51 +01:00
Sergio Ahumada
fb3b01d888 Replace com.nokia.qtcreator with org.qt-project.qtcreator
Task-number: QTCREATORBUG-8189
Change-Id: I1c882f55eed901620ef4944bf1789645b7cff34a
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-02-07 12:40:37 +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
Oswald Buddenhagen
276320caac make doc generation work cleanly with both qt4 & qt5
qdoc does not expand variables in include() statements, so we need to
use separate top-level "switch" files.

Change-Id: I3152baa36cb3dee055abdc68c046b445f92e1fb9
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-02-06 09:40:03 +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
75f1e8a66f Doc: fix missing snippets
Add the path to the snippets folder to the qdocconf file
and fix the paths in \snippet commands in the source file.

Change-Id: Iebabec6919b580e6d1474685777862200d314a83
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-01-23 12:42:07 +01:00
Eike Ziller
cf937f09d6 Avoid pulling in "Extending Manual" into Qt Creator manual.
With Qt5, qdoc finds the doc/api/*.qdoc files if the examplesdir points
to doc/, leading to the two toplevel index.html files ending up within
qtcreator.qch

Change-Id: I4ac3c1447c6924c4e292024919d52ddb97e1f8cc
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2012-12-17 12:47:49 +01:00
Eike Ziller
8c4d86d174 Fix Qt Creator manual style when generating with Qt 5.
The HTML.templatedir is no longer used in Qt 5. Instead, the files
are resolved relative to the referencing qdocconf.
So we set the templatedir to the path of the qdocconf (for Qt 4)
and change the references to be relative to that path.
Also, it's HTML.extraimages in Qt 5, instead of extraimages.HTML

Task-number: QTBUG-28304
Change-Id: I5b253ea9fac5825c49f74460df188a7fca5c89cd
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2012-12-10 13:42:15 +01:00
Jerome Pasion
b28432648d Doc: Making the header consistent with Qt reference documentation.
Change-Id: I2272f577b707ffd2f308924ba01b768c81decaa8
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2012-10-23 12:23:52 +02:00
Eike Ziller
1504ca67fb More Nokia -> Digia/QtProject changes
Change-Id: If52505dbc95ee48ac3467cdfbbea91629c11089c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-10-09 12:24:24 +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