Commit Graph

123 Commits

Author SHA1 Message Date
Leena Miettinen 2205051eac Doc: Qt Canvas 3D Application wizard
Update related screen shots

Change-Id: I45af80a69ded0fbcc945e5f6b4ccef7b03317dbb
Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-07-10 07:52:37 +00:00
Leena Miettinen 240d5dafd0 Doc: update docs to match wizard changes
Update screen shots.

Change-Id: If77af9e6959f112c5970bfa6d4f5c0b93025ba82
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-07-03 09:18:31 +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 f84169b51e Doc: update the Qt Quick Application tutorial
To match the changes in the application templates
and the Qt Quick Designer UI.

Use the \example command to create an HTML of the
example QML file.

Change-Id: I4da7d5f3f14ae7a1e9597204cb9dbcd54c4127cd
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-06-26 13:41:57 +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 0c26483d0f Doc: Qt Quick 1.1 component was removed from wizard
Change-Id: Ife7a77e7e04fff88cb7c0760be5e81e798553056
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-05-08 15:07:02 +00:00
Eike Ziller 4058ff6fe9 Merge remote-tracking branch 'origin/3.4'
Conflicts:
	src/libs/extensionsystem/pluginview.cpp

Change-Id: I410156c1003d5dc81e915110c6d432bcd71da010
2015-05-07 14:42:46 +02:00
Leena Miettinen 133f994589 Doc: update the Qt Quick application tutorial
To version 3.4, but still using the Qt Quick 2.1
component.

Task-number: QTCREATORBUG-14341
Change-Id: Ifd9638ea5b111554f2ea7838623104aab27963a3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-05-04 15:11:22 +00:00
Tobias Hunger 5b77a3a8c1 Blackberry: Remove blackberry support
Keep QNX.

A short informal search did not turn up any more blackberry users,
even though there is interest in QNX. So this patch removes the
platform: We had no contact with the maintainers in months, there
are no changes going into the code for about as long.

I am not even aware of anybody testing the platform, so any
remaining users are probably better of with Qt Creator 3.2 or so
where the code was extensively tested.

Change-Id: Ibeda6bfd8565599918cfcc08fd01cb5ed8793dc2
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-04-30 11:15:53 +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
Tobias Hunger 11f6cc7c3f Doc: Replace links to gitorious
Gitorious is closing down, so set links to qt.io sites.

Change-Id: If8c2576f1015066266b8a308f42e902020ab188c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-03-23 11:25:29 +00:00
Eike Ziller 56aadc407d Merge remote-tracking branch 'origin/3.3'
Conflicts:
	src/plugins/debugger/watchhandler.cpp
	src/plugins/projectexplorer/kitmodel.cpp
	src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
	src/shared/qbs

Change-Id: I6a68090993a264e93ac7850858cc24ba6bdb5602
2015-02-12 17:36:29 +01:00
Eike Ziller 9926fc2ab1 Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'
Conflicts:
	src/libs/utils/tooltip/tipcontents.cpp
	src/libs/utils/tooltip/tipcontents.h
	src/plugins/android/androiddeployqtstep.cpp
	src/plugins/baremetal/baremetalconstants.h
	src/plugins/baremetal/baremetaldevice.cpp
	src/plugins/baremetal/baremetaldevice.h
	src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwidget.h
	src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h
	src/plugins/baremetal/baremetalplugin.cpp
	src/plugins/baremetal/baremetalplugin.h
	src/plugins/baremetal/baremetalruncontrolfactory.cpp
	src/plugins/baremetal/baremetalruncontrolfactory.h
	src/plugins/cppeditor/cppcodemodelinspectordialog.cpp
	src/plugins/cppeditor/cppdoxygen_test.cpp
	src/plugins/cppeditor/cppdoxygen_test.h
	src/plugins/debugger/breakpointmarker.cpp
	src/plugins/debugger/debuggeritemmodel.cpp
	src/plugins/debugger/debuggeritemmodel.h
	src/plugins/debugger/loadcoredialog.cpp
	src/plugins/genericprojectmanager/cppmodelmanagerhelper.cpp
	src/plugins/projectexplorer/addnewmodel.cpp
	src/plugins/projectexplorer/addnewmodel.h
	src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp
	src/plugins/qmlprofiler/abstracttimelinemodel.cpp
	src/plugins/qmlprofiler/abstracttimelinemodel.h
	src/plugins/qmlprofiler/notesmodel.cpp
	src/plugins/qmlprofiler/qml/CategoryLabel.qml
	src/plugins/qmlprofiler/qml/MainView.qml
	src/plugins/qmlprofiler/qml/Overview.js
	src/plugins/qmlprofiler/qml/Overview.qml
	src/plugins/qmlprofiler/qml/TimeDisplay.qml
	src/plugins/qmlprofiler/qml/TimeMarks.qml
	src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp
	src/plugins/qmlprofiler/sortedtimelinemodel.cpp
	src/plugins/qmlprofiler/sortedtimelinemodel.h
	src/plugins/qmlprofiler/timelinemodelaggregator.cpp
	src/plugins/qmlprofiler/timelinemodelaggregator.h
	src/plugins/qmlprofiler/timelinerenderer.cpp
	src/plugins/qmlprofiler/timelinerenderer.h
	src/plugins/qmlprojectmanager/QmlProjectManager.json.in
	src/plugins/texteditor/findinfiles.cpp
	src/plugins/vcsbase/vcsconfigurationpage.cpp
	src/shared/qbs
	src/shared/scriptwrapper/interface_wrap_helpers.h
	src/shared/scriptwrapper/wrap_helpers.h
	tests/auto/qmlprofiler/abstracttimelinemodel/tst_abstracttimelinemodel.cpp
	tests/system/suite_debugger/tst_debug_empty_main/test.py
	tests/system/suite_debugger/tst_qml_js_console/test.py
	tests/system/suite_debugger/tst_qml_locals/test.py

Change-Id: I67540b648f8b162496f4aa606b04d50c7c9125c6
2015-02-12 17:29:21 +01:00
Thomas Hartmann bd91f82a73 Doc: Mention limitation for .ui.qml files in the Open Source version.
Change-Id: I8b4e4853072dccb95d3313837e6fa83e7bb76021
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-01-19 17:39:22 +01:00
Eike Ziller 3c85058694 Update License
Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2015-01-16 12:37:56 +01:00
Eike Ziller b5b47f7df2 Merge remote-tracking branch 'origin/3.3'
Conflicts:
	src/plugins/cppeditor/cppdocumentationcommenthelper.cpp

Change-Id: I2cf25eba1de149765a6c44ad354d606ce9de512d
2015-01-08 10:38:20 +01:00
Leena Miettinen e6f9443394 Doc: fix broken links to Qt 5 reference docs
Some titles had changed and the hash mark references
do not seem to work anymore.

Change-Id: I4ebb877a483eff0a11c32932cc84b6e15935dcec
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-01-07 11:36:36 +01:00
Mitch Curtis 7692addd71 Fix desing typo.
Change-Id: I3357b57a034e0c5445e7c1d66e6c0d6b89b18b7a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2014-12-15 12:32:09 +01:00
Leena Miettinen c046898d94 Doc: replace \gui commands with \uicontrol
Also in master.

Change-Id: I284e57c0fe12cbc1252871aef3c6b3f50054eb79
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-12-15 10:38:24 +01:00
Eike Ziller e07f33db93 Merge remote-tracking branch 'origin/3.3'
Conflicts:
	doc/src/editors/creator-coding-edit-mode.qdoc
	doc/src/qtquick/qtquick-creating.qdoc
	qtcreator.pri
	qtcreator.qbs

Change-Id: I46e5e35419d2871f455f1df8094c5438d34e570b
2014-12-12 13:42:42 +01:00
Leena Miettinen e1fbeedcd4 Doc: use \uicontrol command instead of \gui macro
Change-Id: Idc898b6ac70b6d3186d353086b5f3e45830d1f83
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
2014-12-12 10:26:59 +01:00
hjk 7e8fb3a9e9 QmlProjectManager: Disable by default
It's not the preferred way of operation nowadays and harms startup
times. People who find the plugin useful can still enable it.

Change-Id: I8328f8e8085103d4469bbd7016b86218b4b238b7
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-12-12 08:32:27 +01:00
Leena Miettinen d99cb730a0 Doc: add platform notes for the UI
The manual usually uses the Windows/Linux names and locations
for functions and dialogs. Add information to help OS X users
to follow the instructions.

Task-number: QTCREATORBUG-13626
Change-Id: I7e91b1d52ab580d89feae8564240e759845260e9
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-12-11 11:26:00 +01:00
Leena Miettinen dffd2866b3 Doc: add missing info about sidebar views in Qt Quick Designer
As it turns out that we have a sidebar also in the Design mode,
with partly the same views as in the Edit and Debug modes, I
added info about the missing views and fixed the terminology.

Change-Id: I997d472548781a466bec3e64dbf28ecb1476b3eb
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-12-04 12:36:28 +01:00
Leena Miettinen 15a18c83d9 Doc: Qt Quick Designer extensions
Move the documentation for commercial features from a separate
manual to the Qt Creator Manual.

Change-Id: Ifc8f10bda4a2a234e4b81f812601ce2ceb104ddd
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-12-04 11:09:08 +01:00
Leena Miettinen 95afdf6c38 Doc: QML_PUPPET_MODE env variable
The variable was added for checking whether a QML plugin
is run in Design mode or by an application.

Task-number: QTCREATORBUG-12439
Change-Id: Iad99b7279c8191cb8b17ca81ff24fb9db731fdc9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-12-01 11:31:37 +01:00
Leena Miettinen 16c3745da4 Doc: update QML emulation layer options
A check box was divided into two radio buttons.

Change-Id: I0439e038be2508a62811a5200c10a07367e85576
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2014-11-28 14:25:58 +01:00
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