Commit Graph

55 Commits

Author SHA1 Message Date
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
Oswald Buddenhagen
f1cec4629e Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/libs/utils/tooltip/tips.cpp
	src/plugins/coreplugin/versiondialog.cpp
	src/plugins/projectexplorer/kitinformationconfigwidget.cpp
	src/plugins/qnx/blackberryapplicationrunner.cpp
	src/plugins/qnx/blackberrydeployconfiguration.cpp
	src/plugins/qnx/blackberrydeployconfiguration.h
	src/plugins/qt4projectmanager/qmakekitconfigwidget.cpp

Change-Id: I7886ec971942d9e0a9da237dcf4ceb1687abd71b
2013-01-29 15:52:36 +01:00
Leena Miettinen
75f1e8a66f Doc: fix missing snippets
Add the path to the snippets folder to the qdocconf file
and fix the paths in \snippet commands in the source file.

Change-Id: Iebabec6919b580e6d1474685777862200d314a83
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-01-23 12:42:07 +01:00
Eike Ziller
03717cf7ef Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/debugger/gdb/gdboptionspage.cpp
	src/plugins/fakevim/fakevimoptions.ui
	src/share/share.qbs

Change-Id: Ic45b68ba7b1cc1b780be4271ba4ee939e6055b80
2012-12-18 17:42:04 +01:00
Eike Ziller
cf937f09d6 Avoid pulling in "Extending Manual" into Qt Creator manual.
With Qt5, qdoc finds the doc/api/*.qdoc files if the examplesdir points
to doc/, leading to the two toplevel index.html files ending up within
qtcreator.qch

Change-Id: I4ac3c1447c6924c4e292024919d52ddb97e1f8cc
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2012-12-17 12:47:49 +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
8b8d104c58 Doc: where appropriate, refer to Qt 4 SDK
The contents of the Qt 5 installation program will differ from those
of the previous Qt SDK (no tool chains for Nokia mobile devices, for
example). To make this clear, refer to the Qt 4 SDK, where appropriate.

Change-Id: Ia6c3ab5fc3edd150fbe5362f85353243860afdb7
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-10-22 15:38:53 +02: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
Leena Miettinen
22b7450496 Doc: Qt Quick Designer only supports Qt Quick 1
Change-Id: Ic0e746a053522d494d03e9add6cc4813072d0ec3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-10-08 10:41:05 +02: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
aeca8714b5 Doc: the Qt Quick 2 application wizard
Change-Id: I586a669995ca173648783bed2f1e6ea675aacda3
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2012-09-28 16:07:25 +02:00
Leena Miettinen
1f8c835310 Doc: replace "targets" with "devices" or "target platforms"
Try to make the terminology more consistent, where possible.

Change-Id: Ic3f86fcffe845f9a118bb2ee630e706e832e8e05
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-09-14 13:20:29 +02:00
Eike Ziller
328d205b62 Device type + tool chain + other settings -> Kit
We called that "Target" before

Change-Id: Ie0d673c643947c26ac2706907f6250fc1739388a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
2012-09-04 15:24:06 +02:00
Leena Miettinen
fd8de2f48d Doc: some cleanup after the Symbian target removal
Fix next and previous links, remove links to obsolete
topics, add a note about removed Symbian support.

Change-Id: I585e3cf868df6310c06465ea826c29d1b977e188
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-08-23 16:46:14 +02:00
Leena Miettinen
cec8bcba5b Doc: Qt version field has been removed from run settings
Change-Id: I812fc0b7de8d94c3706c36a63ab0c988b0ce815d
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-08-22 16:20:50 +02:00
Alessandro Portale
ae23d50576 Removal of Symbian support
Qt Creator's support for Symbian was at its peak in version
2.4.x. Nobody really verified it in Qt Creator 2.5 or 2.6.
It is most likely rotten. Let's remove it!

Also, the Symbian support code was spread throughout the whole
Qt Creator code base. The plugin interfaces evolved in the
meantime and target platforms like Android or QNX have 99% of
their code in separate plugins.

In case anyone wants to revive Symbian support in Qt Creator,
please create a plugin for it.

Change-Id: I56a758a3e2fd5b8c64d9aeb8f63d8e916c4883be
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-08-22 13:42:42 +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
Leena Miettinen
5370178d8b Doc: remove link to obsolete component set
The components are no longer maintained by
Nokia Developer

Change-Id: I57daf732f324e6a58a394b256580c10703ec6633
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
2012-08-17 13:16:23 +02:00
Leena Miettinen
a5b4effb3a Doc: target options
Related changes to tool chains and Qt versions.

Change-Id: I3a1923f8dd84321dd78c969d14c15c52b17d5ae2
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-08-15 10:11:32 +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
e271000bf7 Doc: reorganize info to make it clearer
Readers got confused with qmldump and qmlplugindump

Change-Id: Ia228ac43e1f40659bc6df4e6e5fc5139055fc455
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-05-11 11:57:51 +02:00
Leena Miettinen
f26c029a68 Doc: update screen shots
Change-Id: Ib987a9861b7494f889be299b01abbac84a6b82a8
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
2012-04-13 14:39:25 +02:00
Leena Miettinen
17be75b9cf Doc: update information about creating buttons
Update screen shots

Change-Id: I09e3b3cd496c338ce390c3a82bd7468b7be0b97f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2012-04-13 11:34:21 +02:00
Leena Miettinen
36927af97d Fix field label
Change-Id: I07dcb6032e003193821e7bcbd47f5402728cc34a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
2012-04-11 15:38:51 +02:00
Leena Miettinen
b8cd8d337f Doc: update screen shots
Add references to screen elements in text as numbers.

Update link to Qt Quick Designer options.

Change-Id: Ifff0f0a203e922943367f9069e8ebb6f35244878
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2012-03-23 08:55:55 +01:00
Leena Miettinen
d75c404078 Doc: move debugger settings to separate section
Update screenshots

Change-Id: I6b69f812284d53d2fde4ee957dbfff1b0e56a032
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-03-21 14:45:34 +01:00
Leena Miettinen
41f4c1fab4 Doc: update the Qt Quick tutorial (built-in) elements
Update all screenshots.

Change-Id: Ib3f07b940f4121caa5ff567d070c448b81e2f124
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2012-03-09 09:57:33 +01:00
Leena Miettinen
21a5993b17 Doc: changes to the Qt Quick project wizards
Update all screen shots.

Change-Id: I3250dba678bc641fdaf767cbabf7f471e63bab3a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2012-03-08 15:25:48 +01: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
a5661ddabc Doc: divide file into several files
Mostly, place one topic into one file.

Change-Id: I8fdf43f14179816c0a57883068acd15b13a3761a
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-12-14 15:22:43 +01:00
Leena Miettinen
feaf023fd2 Doc: replace \i with \o in \row tags
The \i command has become obsolete.

Change-Id: Iee2bc3f4e54be063f805ffe981748e54fafac8fe
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
2011-12-13 17:06:04 +01:00
Leena Miettinen
88e29febba Doc: restructure doc according to developer workflow
Add and remove illustrations.
Add landing pages.

Change-Id: I927d62aee9dc43814ef7f4d7424a83eee2af156b
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
2011-12-13 13:55:34 +01:00
Oswald Buddenhagen
47b1e7ba3f fix navigation links
Change-Id: I0eee92cd095070da259bfd6b1c6da43c596d6ee1
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
2011-11-30 21:54:02 +01:00
Leena Miettinen
401a76fbaa Doc: import statement in new project wizard
New Qt Quick application wizard now imports Qt Quick 1.1.

Change-Id: Id1433364b29a5f23d351d4cd07cc22e69b52f67c
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2011-11-22 16:03:48 +01:00
Leena Miettinen
b2987e3c2d Doc: fix macro
The macro points to the wrong visual editor.

Change-Id: I2663fdac1789f0701669fb1d4bcbc4272beb7bfe
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
2011-11-16 17:01:01 +01:00
Leena Miettinen
803c012e62 Doc: add example code to the tutorial
Task-number: QTCREATORBUG-6540
Change-Id: I4b5f7e73ee49e03621a9461d037e13c251959e84
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2011-11-16 13:21:12 +01:00
Leena Miettinen
646b2f4e6e Doc: add steps to select components
Users now have to know which components to import.

Change-Id: I70afdc7dc15055f166074e5807d3e2ee2dd0b2f4
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2011-11-15 15:13:32 +01:00
hjk
31600758de all: s/info@qt.nokia.com/qt-info@nokia.com/
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-11-03 10:33:19 +01:00