Commit Graph

61 Commits

Author SHA1 Message Date
Leena Miettinen
95e8f82914 Doc: Fix \include command target
If the whole file is included, the copyright statement is printed
in the HTML file (and we don't want that).

Change-Id: I341c658182745facd000c6ad7ce073c1a37caded
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-02-16 13:24:16 +00:00
Eike Ziller
e724934393 Merge remote-tracking branch 'origin/4.2'
Conflicts:
	doc/src/qtquick/creator-tutorial-create-qq-project.qdocinc
	doc/src/qtquick/qtquick-creating.qdoc
	doc/src/qtquick/qtquick-uiforms-tutorial.qdoc
	share/qtcreator/welcomescreen/qtcreator_tutorials.xml
	src/plugins/git/gitgrep.cpp
	src/shared/qbs

Change-Id: I6f4d168d888d9547c3af0819f79cc9ebb4186ca0
2017-02-14 15:32:04 +01:00
Leena Miettinen
c3608ec7e0 Doc: State that Qt Quick Projects cannot be deployed to mobile
...or embedded. Suggest creating an application, instead.

Task-number: QTCREATORBUG-17708
Change-Id: I6b5b1f26bde0d281f162bc68d5cb9088e8fc79cd
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-02-13 10:11:00 +00:00
Leena Miettinen
8e536a3b01 Doc: Update descriptions of Qt Quick wizards
Qt Quick Controls Application, Qt Quick UI, and Qt Quick Extension
Plugins wizards have been removed from Qt Creator.

Change-Id: I30e6e59e38d7f120d35f6cf34603d4ec356a5ef4
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-02-06 09:57:36 +00:00
Leena Miettinen
73e4859c00 Doc: Remove descriptions of Qt Quick Controls 1
Support for the Qt Quick Controls 1 has been removed.

Change-Id: I6fc64cea94ee64cabb19935124bb9e8fdc3d1089
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-12-06 09:10:39 +00:00
Tim Jenssen
3b503d87f2 Doc: remove Qt Labs Controls advices
It was just a testballoon and they are living as
Qt Quick Controls 2 in newer Qt versions.

Change-Id: Ic65a7af0866be5e1427e3165ab588ee28c2db051
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2016-09-30 13:28:18 +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
55466483cb Doc: Update descriptions of Qt Quick Application wizards
Some fields are only available in some wizards.

Change-Id: Ibecca943fcd5ce8bdc131896762093c1918d56cd
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-07-29 07:34:11 +00:00
Leena Miettinen
083b1175c9 Doc: Link to released Qt Quick Controls 2 docs
Change-Id: I5ddb23ae1f78aae136869fd335030b530e1f266a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-06-20 08:16:12 +00:00
Leena Miettinen
32ff202a79 Doc: Describe Qt Quick Controls 2 Application wizard
Update screenshots.

Change-Id: I6069e08113cae83142d249e3f331586acce63ca9
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-05-26 09:56:50 +00:00
Leena Miettinen
f3fab4423f Doc: using Qt Labs Controls
- Describe the wizard
- Mention Labs Controls besides older Controls

Change-Id: Ib9182c5ebc9c8ee4478018dd5ef29841284eb3de
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-03-23 08:20:21 +00:00
Tobias Hunger
43800a6aa8 Update License according to agreement with Free Qt Foundation
* Update license in documentation files. Stay at FDL, but update
  URLs as well as license for examples, etc.

Change-Id: I5e8cb5a20f0e9d52fba1d937b7c73197d69dd747
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-19 13:09:03 +00:00
Leena Miettinen
140b39487b Doc: fix label text in docs
Libraries -> Library

Change-Id: I39117f76c332b2a08196e2e40551a64ba1d1b135
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-11-16 13:53:54 +00:00
Leena Miettinen
78d304674f Doc: developing for embedded devices
Add information about Qt for Device Creation
integration with Qt Creator. Add links to the
Qt for Device Creation documentation where
appropriate.

Change-Id: Ie9be5a65697681590e2131407432f826a5ab4f2e
Reviewed-by: Rainer Keller <rainer.keller@theqtcompany.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
2015-08-26 11:24:24 +00:00
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
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
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
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
Eike Ziller
3c85058694 Update License
Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2015-01-16 12:37:56 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Eike Ziller
ba1d5f2cdf Merge remote-tracking branch 'origin/2.6'
Conflicts:
	share/share.qbs
	src/plugins/cpptools/cppchecksymbols.cpp
	src/plugins/texteditor/behaviorsettingswidget.cpp

Change-Id: Ia34060984f9c036b2f28a6411d796d41f55a3e37
2012-11-27 11:50:56 +01:00
Leena Miettinen
204902f5fd Doc: separate extension plugins for Qt Quick 1 and 2
Task-number: QTCREATORBUG-8269

Change-Id: I83dbfa1eb12405c6d9e4609669ecef165b348cf2
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2012-11-26 11:56:27 +01:00
Eike Ziller
387f5a7006 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/cpptools/cppcompletion_test.cpp
	src/plugins/projectexplorer/kitmanagerconfigwidget.cpp
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qtsupport/baseqtversion.cpp
	tests/auto/cplusplus/findusages/tst_findusages.cpp

Change-Id: Idd2abc09753a71a6c252bfa9914274459b2c7e63
2012-11-26 10:52:28 +01:00
Leena Miettinen
dd8396ed06 Doc: using QML Scene for Qt 5 and Qt Quick 2
Task-number: QTCREATORBUG-8170

Change-Id: I2d1a2635b1efe820390084d20712c1fd9961276e
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2012-11-20 14:43:54 +01:00
Mitch Curtis
dbd3e2a971 Fix incorrect sentence in New Project dialog.
"[...] this type of projects." should be "[...] this type of project."

Change-Id: Icc6bbb09ce98f453b76aef34b540d0c2db40cdf1
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2012-10-31 12:47:02 +01:00
Leena Miettinen
3f2e43748c Doc: remove detail from the instructions for creating projects
The wizards guide the users through the tasks. The terminology keeps
changing, so it is difficult to keep up with the screenshots.

Remove obsolete screenshot.

Change-Id: If33af5be43fc8ca0611a419ee03ffdbb3b6ccdb1
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-10-10 16:32:56 +02:00