feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
36,628 Commits 108 Branches 368 Tags
f058970321ff22220f7ba237e40e256927a78381
Commit Graph

32 Commits

Author SHA1 Message Date
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
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
Eike Ziller
236ea9efb9 Merge remote-tracking branch 'origin/3.0' 
Conflicts:
	share/qtcreator/debugger/dumper.cpp
	share/qtcreator/debugger/dumper_p.h
	share/qtcreator/debugger/test/main.cpp
	src/plugins/debugger/gdb/classicgdbengine.cpp
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/debugger/lldblib/guest/lldbengineguest.cpp
	src/plugins/debugger/lldblib/guest/lldbengineguest.h
	src/plugins/debugger/lldblib/guest/main.cpp
	src/plugins/debugger/lldblib/ipcengineguest.cpp
	src/plugins/debugger/lldblib/ipcengineguest.h
	src/plugins/debugger/lldblib/ipcenginehost.cpp
	src/plugins/debugger/lldblib/ipcenginehost.h
	src/plugins/debugger/lldblib/lldbenginehost.cpp
	src/plugins/debugger/lldblib/lldboptionspage.cpp
	src/plugins/qbsprojectmanager/qbsstep.cpp
	src/plugins/qbsprojectmanager/qbsstep.h
	src/plugins/qmlprofiler/canvas/qdeclarativecanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativecanvas_p.h
	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d_p.h
	src/plugins/qmlprofiler/canvas/qmlprofilercanvas.cpp
	src/plugins/qnx/blackberrycheckdevmodestep.cpp
	src/plugins/qtsupport/debugginghelper.cpp

Change-Id: Ie9fd0a885fb6264a6a8a72daee071b75bcbd2e9d
 2014-01-08 11:01:06 +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
7eae946bd6 Doc: merging with Git fast-forward option 
If fast-forwarding is possible, you can select whether to do
it or not.

Change-Id: Idd97793da496cbfbb600517bf278660687cc7520
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2014-01-07 10:09:13 +01:00
Leena Miettinen
3ee9fb4d1c Doc: uncommitting revisions using Bazaar 
Document the new Uncommit function and the options in
the Uncommit dialog.

Change-Id: I8f1ded2a395dfa606fe9e6df79a055c4d2cba77e
Reviewed-by: Hugues Delorme <delorme.hugues@fougsys.fr>
 2013-12-12 09:38:57 +01:00
Leena Miettinen
d58e93bb12 Doc: new Git commands. 
Update screenshots.

Change-Id: I02fad85ba02bb8303e94202bc3e030d3767740cd
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-11-01 11:53:45 +01:00
Leena Miettinen
6312936c32 Doc: reflect changes in the Gerrit dialogs 
Update field labels and screenshots.

Change-Id: I8285a2d4f4ef663296993a1fa23088ebba6f6052
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-06-18 16:54:30 +02:00
Leena Miettinen
70c751f2c2 Doc: fix table in the VCS topic 
By removing an extra \li command.

Change-Id: I1a5c97123757a3bc3c767b43be2ab99b9e12e212
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2013-06-18 14:13:17 +02:00
Leena Miettinen
0b6d8a1da5 Doc: new Git commands 
Actions on Commits, Fixup Last Commit, Interactive Rebase,
Rename branch, Push to remote repository, and Push to Gerrit

Change-Id: I434f836944d9fa86fad73f0256b330aad9532ed0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2013-06-11 09:07:43 +02:00
Leena Miettinen
3ed5fc2b8f Doc: the side-by-side diff editor 
Change-Id: Ia984077086dd1f6c44be08176ab846f54be05cca
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2013-06-07 09:43:31 +02:00
Tobias Hunger
69a9dc3f1c SVN: Document minimum required Subversion version 
Change-Id: Ia689f7686b1efe30e839aa03a5a3f9c5cd801915
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2013-06-03 10:15:17 +02:00
Leena Miettinen
48687fd8a1 Doc: fix changed field labels 
Change-Id: I2a9fa92f80c51c088d855f5fec57aecacbb4bea2
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-04-23 09:47:09 +02: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
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
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
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
Orgad Shaneh
b53d398e2c Git: Add context-menu actions for cherry-pick and revert 
Change-Id: Ic266fe039423a37df2fc347ead7530322ac47bb8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-01-23 18:50:45 +01: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
fe1f97ce43 Doc: experimental ClearCase plugin 
Change-Id: Ia32913d0fc76700502c7f25f4fcb987b784e104a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2012-09-28 11:52:46 +02:00
Sergio Ahumada
9c2afc4f29 doc: Fix some spelling errors 
Change-Id: I22c0de2d1c5277879fe504764c15a76d1d7f198b
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2012-09-21 16:26:19 +02:00
Leena Miettinen
e666f88700 Doc: remove non-existing command 
There is no Push command in the CVS plugin.

Change-Id: Id1dfcbc524db943a811461d29ac25070ba9d5e49
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-08-20 10:57:06 +02:00
Leena Miettinen
d0f0635731 Doc: Gerrit plugin 
Change-Id: I771bd1fc49483569b1289d837fc7f2399f0bfed8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2012-07-31 15:01:49 +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
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
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
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
Leena Miettinen
76b59d0300 Doc: move misc howto topics to a separate folder 
Change-Id: I586e3abfbfd578157fc41e3e82fa174494dfdfe9
Reviewed-on: http://codereview.qt-project.org/5609
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
 2011-09-27 15:55:27 +02:00