feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
53,935 Commits 108 Branches 368 Tags
8accfddb17526ecab910123f2bc91c2cf66646f4
Commit Graph

1229 Commits

Author SHA1 Message Date
Leena Miettinen
3a51290fb9 Doc: fix misleading information about indentation 
Intentation is set separately for text files that contain
C++ or QML code and other text files.

Change-Id: I5106d794ad516f745b07b0ebbb94bd4a652060d8
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-04-05 12:51:17 +02:00
Eike Ziller
599be01a67 Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	share/qtcreator/qml/qmlpuppet/interfaces/interfaces.pri
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancesignalspy.cpp
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
	share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.h
	src/plugins/debugger/debuggerplugin.cpp
	src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.cpp
	src/plugins/qmldesigner/components/debugview/debugview.cpp
	src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp
	src/plugins/qmldesigner/components/formeditor/abstractcustomtool.h
	src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
	src/plugins/qmldesigner/components/integration/stackedutilitypanelcontroller.h
	src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp
	src/plugins/qmldesigner/components/navigator/navigatorview.cpp
	src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
	src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
	src/plugins/qmldesigner/designercore/include/abstractview.h
	src/plugins/qmldesigner/designercore/include/qmldesignercorelib_global.h
	src/plugins/qmldesigner/designercore/include/rewriterview.h
	src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp
	src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
	src/plugins/qmldesigner/designercore/model/abstractview.cpp
	src/plugins/qmldesigner/designmodewidget.cpp

Change-Id: I9d8126e88397c02a87b5e4ab4da44e2bc7089134
 2013-03-26 13:09:43 +01:00
Eike Ziller
6550cf4835 Update documentation on enabling the Qbs project manager. 
Change-Id: Ide78109917d04464b5beb51d05599bd92182a343
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2013-03-21 16:55:17 +01:00
Eike Ziller
99b2eb1ca9 Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	doc/src/debugger/qtquick-debugger-example.qdoc

Change-Id: If9a6ac2db76773c50aae26c5156e6aa2603329b3
 2013-03-18 10:19:14 +01: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
79f6e4dda7 Doc: the script console is now an output pane 
Fix some remaining occurences and screenshots.

Change-Id: Ibb8d874996fe767aca180b2964559313efa8157e
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
 2013-03-13 13:53:54 +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
Daniel Molkentin
2b6c79eb10 Add notes about deployment to generic linux devices 
Change-Id: I00608da5000e9bb2274aae8b27dee2235d7852b8
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2013-03-11 13:46:24 +01:00
Leena Miettinen
ce49ca841b Doc: Add Definition now works for all functions 
Change-Id: Ic207120b5a4109fa8a9a521be6cb0bbbcebc8f9b
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-03-07 17:22:15 +01:00
Rafael Roquetto
4351f1c3b1 BlackBerry key signing documentation 
Change-Id: I88dd8ecb73bafa2b41d7b9051d6c95c37411fa82
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Laszlo Papp <lpapp@kde.org>
 2013-03-07 14:20:55 +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
1da5316e5c Doc: add BlackBerry 10 to supported target platforms 
Change-Id: Ie41f64e10c783baf643e1f97386db1757d0d6dd3
Reviewed-by: Mehdi Fekari <mfekari@rim.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2013-03-06 16:54: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
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
deb7005b96 Doc: kits can be added for BlackBerry 10 
Change-Id: I765b3f1b58cfd17e8dfec9d43e04aebf3e403492
Reviewed-by: Mehdi Fekari <mfekari@rim.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2013-03-05 17:10:15 +01:00
Leena Miettinen
2e6f4d9b82 Doc: items in Issues page context menu 
Remove and Show in Editor items were not
documented.

Change-Id: Iec7f2ae6ebc76f715e790de5dbb2e8dbc064b631
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-03-05 15:34:31 +01:00
Leena Miettinen
953201f542 Doc: fix link to previous page in Getting Started 
The link should point to the front page, not the
glossary. Fixnavi somehow messes this up.

Change-Id: Ide1bf5b784874d847a9812d9705518dee6845111
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2013-03-05 14:37:46 +01:00
Leena Miettinen
f57795aaf2 Doc: remove image of Filter Files icon 
The icon and text pointed to the same function,
somewhat confusingly, and the image already appears
on this page.

Change-Id: I15c317280f6689c854d541684cf0e835cc30de7b
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2013-03-05 14:37:22 +01:00
Leena Miettinen
4e3c409d16 Doc: changes to Android plugin 
Change-Id: Ib20faa1df93e1407635a247b93b6c667bff4b256
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-03-05 14:19:26 +01:00
Leena Miettinen
210e54bfde Doc: QML/JS console is now an output pane 
The console is available in all modes.

Change-Id: Iae6d656b255f2836a96b71bcbc9a6e2bbdffbcfc
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
 2013-03-05 10:09:58 +01:00
Leena Miettinen
891ab472a4 Doc: new task list functions 
Change-Id: I560ffbdc68be688fd132239a08ce357c2be9c9a4
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-03-04 15:09:42 +01:00
Leena Miettinen
cec8dd5a93 Doc: fix link to Qt Quick 1 app tutorial in TOC 
Change-Id: I3b309706c15e586e47ba0573b170ad15060b6d12
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2013-03-01 14:43:58 +01:00
El Mehdi Fekari
1294ee66da Qnx: add basic BB10 help pages 
Change-Id: I5d2f16a6aa7824e47ec72ae7bd3f4fadfbc7518a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2013-03-01 12:53:15 +01:00
Leena Miettinen
cf92623aa6 Doc: new Git functions 
Rewrite doc to reflect the new structure of the Git
menu.

Change-Id: I9d4638379416ea33ce0b1399265e8b08ed7fe6e5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-02-28 15:40:55 +01:00
Leena Miettinen
2221f47bca Doc: enabling the Madde plugin 
Change-Id: Id023b9a8bbb1d2d5722f5bb4f35026eb44536ae0
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2013-02-28 13:56:19 +01:00
Leena Miettinen
0c0319ea8c Doc: get rid of short tables in VCS topic 
Replace tables with less than 2 rows with text paragraphs.

Change-Id: I0a51f800dba5d137a7bb0d5c3b8842dece28cffa
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-02-28 09:20:32 +01:00
hjk
7660636971 Debugger: Mention possibility to globally disable ptrace_scope. 
Change-Id: I71cb34635711477508bda08c84bd998344346142
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-02-28 08:13:09 +01:00
Leena Miettinen
88fe1ce5b7 Doc: new ways of managing breakpoint 
Describe breakpoint settings in more detail.

Change-Id: I03a9f888fa29c3539f2ed6658f915da5c4c3adc9
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2013-02-22 15:14:30 +01:00
Daniel Teske
8d2f406092 Document -load option 
Change-Id: I122fb60a986070daedb8ee709836f13d0619a8e4
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2013-02-21 13:33:37 +01:00
Leena Miettinen
a958290560 Doc: Add Setting Up a Qbs Project to the TOC 
This currently only affects the fixnavi script.

Change-Id: I08806d20fb52167961a4c763342623b39f66a177
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2013-02-21 12:18:10 +01:00
Leena Miettinen
3e4fc1b309 Doc: ClearCase is no longer experimental in 2.7 
Left 2.6 there, as ClearCase was already available
there.

Change-Id: I11a9df6ad40e3ec0f1b5118cd6ac4402df5697fd
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-02-20 15:25:18 +01:00
Leena Miettinen
c6bf98c0d6 Doc: Git version 1.7.2, or later, is required 
Change-Id: I1b8e72ac84ad4bd6e6db9c92df087c466d4e23bf
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-02-20 14:17:19 +01:00
Leena Miettinen
b4734c9e7a Doc: experimental Qbs support 
Change-Id: Id82e6fdc67a4794921f1a87def7ea0dae619c336
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-20 13:54:28 +01:00
Leena Miettinen
2a88db5fa8 Doc: describe Android Debug Bridge (adb) 
The abbreviation appears in error messages.
Also describe using GDB to debug applications
on Android.

Change-Id: If3b44dddba94faae7b7da5e01ec57960e5326c8e
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
 2013-02-19 09:10:04 +01:00
Leena Miettinen
e953743d90 Doc: changing and copying kits in Build & Run settings 
Describe the new menu items for kits.
Remove image of an obsolete button.

Change-Id: I51703a96280d69a47c50116f0f41858b4fcccc4e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-18 09:23: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
6b1c306b13 Doc: adding custom compilers 
Change-Id: I96827283dc1318ef74452026d2306b6f32ca72b5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-02-15 10:56:06 +01:00
Leena Miettinen
dc31eda337 Doc: rearranged QML JS syntax check messages 
Moved a message to its correct place (numerical order)
in the table and added a link to a related message.

Fixed wording of two messages that were changed.

Change-Id: I1c6b8148824eab7d27a118de9327e8658f882bd5
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-02-15 10:33:18 +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
5686983e95 Doc: new QML syntax check messages 
Change-Id: Id0090e02b98592ab2a43f997590cbae6493f1279
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-02-14 15:56:45 +01:00
David Schulz
6ef0cf1a30 Editor: Refactor Open Link in Next Split. 
Cleanup code and added shortcuts and menu entries for
- open header/source in next split
- follow symbol under cursor in next split
- open declaration/definition in next split

Change-Id: I2c4347749d26669d88b7c2968f30f60710f442b1
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2013-02-14 09:46:16 +01:00
Leena Miettinen
8a0bf72820 Doc: fix special character that was not rendered correctly 
Use a dash, instead.

Change-Id: I6d4e260a24973429d3923a5f5f9f34dd3b6d5277
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2013-02-07 14:40:40 +01:00
Leena Miettinen
2e94fc9487 Doc: making in-source builds the default option 
Fix capitalization of the new UI string.

Change-Id: Iaf1dd279639936cb59aa658834c71a49ce1398ac
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-02-07 14:35:26 +01:00
Leena Miettinen
c9e9b8d144 Doc: showing hidden files in File System view in sidebar 
Change-Id: Ib2dcfc7b64feee3139d964b72d53648de6408762
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-02-07 14:35:12 +01:00
Nikolai Kosjar
608745078d Doc: Document recently added quick fixes. 
Change-Id: Ibd8ca7b8f87e541c189b2631dcd2f07026035550
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2013-02-06 12:21:30 +01:00
Leena Miettinen
281eb3d414 Doc: adding notes to bookmarks. 
Fix capitalization of the new UI text.

Change-Id: Iedca6d494efad25f71a6143dd353dc369d93bec5
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-02-06 11:43:44 +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