Commit Graph

146 Commits

Author SHA1 Message Date
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
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
Leena Miettinen
de7e36383f Doc: update the Transitions example
...to use the new Qt logo

Change-Id: I111d070c2ae40b71e650d78bd15d360328b474e3
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-04-20 11:23:48 +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
2e341ffdfe Doc: fix QDoc command in a tutorial
Change-Id: Id511edfce884130a7c93dc8f51eb156a10b5b73f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-12-04 10:41:25 +00:00
Leena Miettinen
1defeda8a3 Doc: link from Adding Connections to examples in another topic
Change-Id: I1bff533c217b75681e37a533e12df0fc2a9695c6
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-12-01 14:44:55 +00:00
Leena Miettinen
1ed73ea36c Doc: fix links to previous and next pages
...for moved pages

Change-Id: Ic52376b73687676c0e09fefc5a53f10c328c18c8
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-11-19 15:39:12 +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
1804d89842 Doc: update instructions for creating custom buttons
Use the Connections view to create connections, bindings,
and properties.

Change-Id: Ib879c5d95a2026bf59bfb1b7a02d0c8a10658c2f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-11-10 13:44:03 +00:00
Leena Miettinen
5c70775ed7 Doc: update mobile app tutorial to use UI forms
Added the main.cpp file and .qrc file so that the example can
be built and run without modifications by users.

Change-Id: Ie74f78102d16b5a514f4c6156ea0558c157c0444
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-11-10 13:03:23 +00:00
Leena Miettinen
309b2b843c Doc: context menu commands in the Navigator
Change-Id: Ibfe6702d410b13936e9512c22539c4b76efce839
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-11-09 10:47:10 +00:00
Leena Miettinen
12f1375f4e Doc: using Go to Implementation context menu command
Change-Id: I1fc905909e4d95934b0669a8d27801d6446548d6
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-11-05 10:14:58 +00:00
Leena Miettinen
aabd0202ca Doc: use include file for project creation instructions
Change-Id: I58f4a581de6273b16d2fc7ba07567527e46bc4d1
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-11-03 14:10:05 +00:00
Leena Miettinen
95c7d6fed5 Doc: update the Transitions example to use UI forms
Move the instructions for creating the project into an
include file that can be used for all Qt Quick Application
tutorials.

Change-Id: I02385f68f23ef2d3ee98b754344781ae1819203c
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-11-03 09:26:49 +00:00
Leena Miettinen
271c6cf6db Doc: mention Qt Quick Extras in "Creating Components"
Change-Id: I9f816084e24d887a6fca5abb3689347156a26558
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-10-27 14:48: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
Sze Howe Koh
a031dbfc3d Doc: Instruct user to select the correct template
The screenshot shows the code template for a Qt Quick Controls
Application, not a Qt Quick Application. This led to user confusion:
https://forum.qt.io/topic/59078/

Change-Id: I41580fd4abd337176e704adcb9547d8d4bb4ef7a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-09-29 14:45:45 +00:00
Leena Miettinen
2108b2de6f Doc: Qt Quick Designer features are no longer commercial only
Change-Id: Ic908670b3f8be7491e2639b3a2d524382580d7e5
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-09-25 14:57:34 +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
ad332762df Doc: update info about QML export scripts
- Switch the download links to Gerrit
- Describe how to edit the scripts to create files that are
  compatible with Qt Quick Designer
- Remove notes about adding Python support for Windows, because
  that now seems to work out of the box

Change-Id: I88f822e1d72658818b140208c264af24ab671b28
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-08-04 08:12:54 +00:00
Leena Miettinen
4c2ab742f1 Doc: fix typo component > components
Change-Id: I1976eda603688f48c95f7e88d108700b07379265
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-07-31 13:40:15 +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
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