Commit Graph

146 Commits

Author SHA1 Message Date
Leena Miettinen
4c119b985a Doc: update accelbubble example source file
To reflect changes in the template.
Hide license header from the docs.

Change-Id: Ib703f5a8c17ef210a14c684caa8ba9ecf8936839
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-11-21 12:22:04 +01:00
Leena Miettinen
c68ffc7c8e Doc: replace Text type with Label type
Because the templates were changed.

Change-Id: Ib64f65d1735604ad0c54addc2c7d1ce850ca08a8
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-11-21 12:21:47 +01:00
Leena Miettinen
687fda833a Doc: replace "Applications" with "Application"
The string was changed in the wizard.
Update screenshots.

Change-Id: I6cd8f664a6aea69eff6c5302a42e32b1f5321ddf
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-11-19 15:56:37 +01:00
Thomas Hartmann
0e29d3f926 Doc: Fix typo
Change-Id: Id10c4e4773340f4d9650561d4335f98485687483
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2014-11-12 11:22:08 +01:00
Leena Miettinen
9a7f4cae00 Doc: using UI forms in Qt Quick Designer
New concept in Qt Creator 3.3 and  Qt 5.4.

Change-Id: I24cacd4c98bb6873625d5cda44a78d5ba0ad8f5b
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-10-29 14:39:48 +01:00
Leena Miettinen
63c8b25ad1 Doc: document QML emulation layer
And the new option to have Qt Creator build the emulation
layer using the kit selected for the project.

Change-Id: I16b3d9e87f21caf7a4ecd1a527df51035494fb34
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-09-17 09:52:38 +02:00
Leena Miettinen
8d6231397e Doc: update Qt Quick version numbers
Make references more generic, because the templates are
frequently updated to import latest Qt Quick and
Qt Quick Controls versions.

Change-Id: Ic3e6744c960fe8f953abf2aaddd2c7498bdb1f38
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-09-11 09:49:09 +02:00
Leena Miettinen
49e6e15384 Doc: remove or hide docs for unsupported QML types
Flipable, StatusBar, and ToolBar are no longer visible
in the Library pane.

Change-Id: I5258ff950e83a49c90b5246d5957d8c9e6382657
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-08-01 14:40:26 +02:00
Leena Miettinen
953d688d88 Doc: add info about Qt Quick Dialogs and Layouts
Task-number: QTCREATORBUG-12721
Change-Id: Ib6ff3e53806be26f714378d4ffcd3b54a36a6e8f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-07-30 13:08:08 +02:00
Mitch Curtis
3c5026b73d Fix typo, group related sentences in qtquick-screens.qdoc.
Change-Id: I2b83b0f42e71b8d7fb55d857e0d14d3e07af9fa1
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-07-07 11:19:17 +02:00
Leena Miettinen
d59d8b568d Doc: replace "Mac OS (X)" with "OS X"
Change-Id: I77f1cbbfc17d759d1587caf2a25a53498848e2ca
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-05-06 09:35:45 +02:00
Leena Miettinen
8bb50b1b1e Doc: update Accelbubble example
The app could not recover from receiving a NaN value from
the Accelerometer, so NaN values are ignored.

Change-Id: Ia33d800f7fe080e07dcf327c26b3772e994793bf
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-04-24 14:02:06 +02:00
Leena Miettinen
7d6c823b86 Doc: update the Qt Quick app tutorial
The wizard in 3.1 uses a Window QML type instead of a Rectangle,
which means that states must be placed within a statusGroup.
The example can no longer be built from Qt Quick 1 elements.
Replaced \snippet commands with \quotefromfile commands.

Change-Id: Ia2cec2b8b638913a2b9b2e27b36e6f2f1ffc4a49
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-04-11 12:52:49 +02:00
Leena Miettinen
c0234c7aa1 Doc: update Qt Quick version imported by new project wizard
The Qt Quick Application wizard now offers the latest versions
of Qt Quick Controls (1.1) and Qt Quick (2.2).

Change-Id: Ief8c2c83632ad77dfdaaec2361ed7913538a0f9c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-04-10 14:52:09 +02:00
Leena Miettinen
042c176a00 Doc: change filename and page name to match title
The Android app tutorial is now a more generic mobile app tutorial, so
it was moved to qtquick folder and renamed as creator-mobile-app-tutorial.qdoc.
The page name (HTML) was also changed accordingly.

Change-Id: I749f45a611b32204e5551884238f79d3d3b639fa
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
(cherry picked from commit 3e0ffdcba4)
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-04-07 16:54:52 +02:00
Topi Reinio
627e2b4807 Doc: Use the page title for linking to index.html
Because the Qt Creator documentation depends on Qt reference
docs for linking, qdoc will generate a collision page for
index.html as it exists in both.

This change prevents linking to the collision page in the
navigation links by using the page title as the link target
instead of the file name.

Task-number: QTCREATORBUG-11035
Change-Id: I5638e09b60543dc2068b0e4a269f8f72d4655b48
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-03-17 14:53:01 +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
e378cd43f0 Doc: list Qt Quick Controls with links to docs
Change-Id: I94f3750851fac7c3fc7b975fc68d982e6c819273
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-11-13 11:29:32 +01:00
Leena Miettinen
a22ebf5336 Doc: describe available positioning methods in one place
Move information about positioning from the "Using Qt Quick
Designer" topic to the "Creating Screens" topic.
Arrange the information in the same way as in the Qt Reference
Documentation. Add information about "Using Layouts" and
"Using Split Views".

Change-Id: I0f940b5f578d5f52e787ef83d230a67efb158a4d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-11-12 16:16:04 +01:00
Leena Miettinen
1bb93fe5b1 Doc: use a macro for the Qt Quick Designer product name
Change-Id: I2aebd41e4e7d64d7941f41c54453a41c8c2d3408
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-11-12 16:15:53 +01:00
Leena Miettinen
270c8c911e Doc: add the Reset View button icon
To make it clearer which button users need to click.

Change-Id: I8e5c38c34262fb569785f99ce64a83760a56468f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-11-12 16:15:40 +01:00
Leena Miettinen
6074f114b7 Doc: hide Web View QML type
Support for the Web View was temporarily dropped as it
was buggy.

Change-Id: I73f6950b6135133cbc4cb69c952271392e00f9c2
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-11-12 16:15:30 +01:00
Leena Miettinen
d6876873d4 Doc: update path to command to create QML files
The command has been moved to the Qt category.
You can now choose between Qt Quick 1 and  Qt Quick 2.

Change-Id: Ifd75326eb54c01876e4701eba516ace30544822c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-11-12 16:15:20 +01:00
Leena Miettinen
9509386a8d Doc: update buttons topics
Update changed field names, remove information about
an obsolete field, and make terminology more consistent.

Change-Id: I71cde2f371de5dc6e04658cc052601994fbf2aad
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-11-12 12:48:49 +01:00
Leena Miettinen
02a3945ebe Doc: add info about Imports tab in Library
Update the screenshot.

Change-Id: Ief6eaf0617a31abdd07e186a8e90224920a02864
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-11-12 12:48:39 +01:00
Leena Miettinen
1a330aa3ad Doc: remove the note about building qml2puppet
The standalone packages for version 3.0 are built with
Qt 5, so the puppet is always delivered.

Change-Id: I49900ebec6f02314a0bf52dae7cb7c995d2ce402
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-11-11 11:05:06 +01:00
Leena Miettinen
e84e8ee783 Doc: the Qt Quick UI project wizards were combined
You now select the imports on the second page of the
wizard.

Change-Id: I07a2519ea31edae547865792b0c409872f5ac09f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-11-07 16:19:16 +01:00
Leena Miettinen
539ba9ed93 Doc: update the Qt Quick app tutorial
Update screenshots.

Change-Id: I1b5ff02464cfe922cd2a75d936327c632e744828
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-11-07 14:53:14 +01:00
Leena Miettinen
4e6918e179 Doc: changes in Qt Quick project wizards
The Qt Quick application wizards were combined into
one wizard and the wizard for importing existing QML
projects was removed.

Change-Id: I2761c0065541a54bb3efe970ed9481352adc9fec
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-11-05 14:13:58 +01:00
Christian Kandeler
0ee5389017 Remove support for Madde-based platforms.
With Nokia's decision to stop support for Harmattan applications
in their app store, the last remains of a use case have disappeared.

Change-Id: Ia036112de01c8c3a866da3529b4a941db11c7358
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-10-15 10:27:28 +02:00
Leena Miettinen
bd9c842a38 Doc: restructure UI design section
Remove graphics and combine some short topics to
put more weight on Qt Quick development instead of
generic UI development.

Change-Id: Ief2041022e0ccb407c26b0742825613223082f0a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-08 13:02:17 +02:00
Leena Miettinen
a5dccb1736 Doc: import statements go to QML files, not pro files
Change-Id: Ia36ffd51add0c92b396e448d8e125848e9754877
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-07-17 15:32:16 +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
Leena Miettinen
c1189541c5 Doc: fixed issues in the Qt Quick app tutorial
Added missing spaces, fixed a link to Qt 5 docs, and added a
missing line of example code.

Change-Id: Ic7305aa6b44b7b9edf33a6828d965ab84289e353
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-06-13 17:41:40 +02:00
Leena Miettinen
df882155b5 Doc: snapping to anchors in the Qt Quick Designer
Add documentation for the new button and update
the screen shots. Fix changed field names.

Change-Id: I291f63b4c87090012a3f4bf2cbbc4172e3b58aa5
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-05-23 16:54:01 +02:00
Oswald Buddenhagen
6fb94a7b10 Merge branch '2.7'
Conflicts:
	doc/src/qtquick/qtquick-components.qdoc
	doc/src/qtquick/qtquick-designer.qdoc
	qtcreator.pri
	qtcreator.qbs
	src/plugins/cppeditor/cppinsertdecldef.cpp
	src/plugins/qnx/qnxruncontrolfactory.cpp

Change-Id: I0a37a07c42719bc0d9ef5b3ac4641d01a63c0d88
2013-05-15 10:21:47 +02:00
Leena Miettinen
3c1b5213b5 Doc: Qt Quick Controls in Qt Creator
Describe the Qt Quick 2 UI with Controls wizard and
using controls in Qt Creator.

Change-Id: I95ba128c8dde7e0e117f649f2ff974f2c6ee624c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
2013-05-10 09:53:08 +02: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
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
91506e974c Doc: fix links to snippets
Change-Id: If49af3120714320e850c4c60fa2fe7739850574b
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-03-07 13:57:00 +01:00
Leena Miettinen
a9dc98572f Doc: use prepositions more consistently: "deploy to"
Change-Id: Icf84c96b7cb300ab7d208b6b4f13276ba0b3d143
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-03-06 16:46:07 +01:00
Leena Miettinen
a3b9c48f67 Doc: update the tutorial app to Qt Quick 2
Change-Id: I9fafe7471567ed9cffae9e86a6c7e15069b683cb
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-03-06 16:42:15 +01:00
Leena Miettinen
7b7058391f Doc: new Qt Quick 2 project wizards
Change-Id: I454ba63b045928d4dcc0ebd4690a2c28cd437056
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-03-06 09:45:18 +01:00
Leena Miettinen
442f4769fc Doc: Qt Quick Designer now supports Qt Quick 2
Change-Id: I36c857af142df077bbf8aa05c1785edf8a6a6373
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-02-15 15:04:19 +01:00
Leena Miettinen
e29e8d3b16 Doc: put QML snippets back to text
A workaround for problems in handling QML snippets.
Remove the snippet files.

Change-Id: Id0f445c031e740eafffd8098b44672c771634eab
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-02-15 09:28:16 +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
1fda2111d4 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
	src/plugins/qmldesigner/designercore/include/widgetqueryview.h
	src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qnx/bardescriptormagicmatcher.h
	src/plugins/qt4projectmanager/profilekeywords.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h

Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
2013-01-31 16:25:33 +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