Commit Graph

14 Commits

Author SHA1 Message Date
Eike Ziller
99b2eb1ca9 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	doc/src/debugger/qtquick-debugger-example.qdoc

Change-Id: If9a6ac2db76773c50aae26c5156e6aa2603329b3
2013-03-18 10:19:14 +01: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
79f6e4dda7 Doc: the script console is now an output pane
Fix some remaining occurences and screenshots.

Change-Id: Ibb8d874996fe767aca180b2964559313efa8157e
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2013-03-13 13:53:54 +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
hjk
386ca7c8dd Adjust license headers
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-05 17:12:56 +02:00
Leena Miettinen
2207a9a987 Doc: QML Inspector was integrated in Locals and Expressions view
Some functionality was removed. Update text and screenshots accordingly.

Change-Id: Iec9057ac17ddb1c3a27244c74038553f5ab46605
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2012-09-27 15:21:56 +02:00
Leena Miettinen
0d0121b033 Doc: switch links to point to qt-project.org
Change-Id: I136a28697c0b7aba03227387c5ce2e106c52708a
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
2012-08-22 08:56:20 +02:00
Eike Ziller
e0e8cf3ada Contact -> qt-project.org
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-19 13:23:21 +02:00
Leena Miettinen
d6d8e2639e Doc: update screenshots for QML debugging
Update changed UI strings.

Use button names in text instead of inlineimages.

Change-Id: Ibe9d91ed27c1afc06a3b7b11157e3d5de3979b17
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-04-18 16:32:52 +02:00
Leena Miettinen
bf18986243 Doc: update next and previous links after moving topics around
Change-Id: If9817373d8120bc669ba427ebe6c244cf60540dc
Reviewed-by: hjk <qthjk@ovi.com>
2012-04-16 15:32:12 +02:00
Leena Miettinen
6696a9b0d0 Doc: change the copyright year to 2012
Change-Id: I31e5f412ec2d4c371382e00503b7ebf5cc57ba02
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
2012-01-26 12:33:30 +01:00
Leena Miettinen
dea780fa01 Doc: add example on debugging QML apps
Change-Id: I20a7c6c8302623b764180d474250d9186a0a6a10
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-01-05 16:54:58 +01:00