feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
29,883 Commits 108 Branches 368 Tags
1d5eb6812a45faff865b866bd2d91ae94e9db414
Commit Graph

92 Commits

Author SHA1 Message Date
Leena Miettinen
1d5eb6812a Doc: the -block CLI command 
Change-Id: I955ebdd5896750fd0c598e9d59cf2ace5c28a591
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-06-05 10:20:59 +02:00
Leena Miettinen
9fa03fb3d5 Doc: applying style sheets to Qt Creator 
Task-number: QTCREATORBUG-9238

Change-Id: Ibbb81dc61f5f2938aee81d85129cdaad48c112df
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-06-04 17:19:14 +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
68a573b62e Doc: do not link to external pages over https 
Replaced "https" with "http" (where redirecting works)
as a workaround for a bug that causes Qt Creator to crash
when trying to open external links using https.

Task-number: QTCREATORBUG-9397
Change-Id: If331eaffd2296a79f6e6f1ee7becd725d2aadb1d
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
 2013-05-31 16:01:49 +02:00
Leena Miettinen
9647ce6932 Doc: hiding the mode selector 
Change-Id: I1002916cc0281396ad1a7ca6481a69eeb9b58622
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-05-31 12:28:19 +02:00
Eike Ziller
38b61177f6 Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
	tests/auto/treeviewfind/treeviewfind.pro

Change-Id: I1ec788373656c947b50d72df6c26c91312469692
 2013-04-23 11:13:25 +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
cf2b3f2e61 Doc: pointers to configuration options 
Add short descriptions of configuration options that we get a lot
of questions about, to make it easier for users to find the information
in the Manual.

Change-Id: I9e5dca80dc99fbf9d241aba9d392ac11d784c5a7
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
 2013-04-19 16:03:03 +02:00
Eike Ziller
65654e4a50 Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	src/plugins/android/androidrunner.cpp
	src/plugins/clearcase/clearcasesync.cpp
	src/plugins/fakevim/fakevimhandler.cpp
	tests/auto/ioutils/ioutils.pro

Change-Id: I31587b8a4dd6aacc1e76803159da51a972878370
 2013-04-08 13:26:37 +02:00
Leena Miettinen
b8acad5365 Doc: VCS information is visible in the Projects pane 
If available, the name of the branch from which the project
was opened is displayed in brackets after the project name in
the Projects view in the sidebar the Edit mode.

Change-Id: Iffec0c8b1a822605f3bbd9d94a1d84aba0cda2e2
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-05 17:18:50 +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
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
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
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
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
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
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
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
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
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
Eike Ziller
021b64b5df Merge remote-tracking branch 'origin/2.6' 2012-10-22 11:17:09 +02:00
hjk
10c4029449 Doc: Update FAQ 
Change-Id: I0e39f0199652d17dcf483485074b62092fe16d03
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2012-10-18 16:06:13 +02:00
Eike Ziller
70b5e1f64d Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qtsupport/baseqtversion.cpp

Change-Id: Id870f70aa35c232dbbd455f83429bab80f266c2d
 2012-10-16 17:42:10 +02:00
Leena Miettinen
944e96fc50 Doc: fix menu item names for opening text editor 
Change-Id: Iad5096cef9366142a17ff9b3dc6c2ff2168d0ccc
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2012-10-16 16:06:01 +02:00
Leena Miettinen
6e23c1b856 Doc: keyboard shortcuts for General Messages and Version Control pages 
Change-Id: I9f397bd4f327b2db0316b4b06ddaf4fc4dd4898d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-10-16 15:37:30 +02:00
Eike Ziller
720cb9f35e Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	qtcreator.pri
	qtcreator.qbp
	src/libs/ssh/sshconnection.cpp

Change-Id: I2946cbec1b5159eef9e47949860b28fba1e51529
 2012-10-11 21:11:40 +02:00
Eike Ziller
942ad98348 Adapt jom download URL. 
Task-number: QTCREATORBUG-7979
Change-Id: I8e0bda75aca620d44651c83e0354846c39594c04
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2012-10-11 13:16:36 +02:00
Eike Ziller
086dd684ab Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	src/plugins/coreplugin/fileiconprovider.cpp
	src/plugins/cppeditor/cppplugin.cpp
	tests/auto/qml/qmldesigner/coretests/coretests.pro

Change-Id: I0e83becf661ded9316ce6766786c9ef4c2f897a7
 2012-10-09 14:27:29 +02:00
Eike Ziller
1504ca67fb More Nokia -> Digia/QtProject changes 
Change-Id: If52505dbc95ee48ac3467cdfbbea91629c11089c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-10-09 12:24:24 +02:00
Eike Ziller
6fd252b0a5 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessageloghandler.h
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/madde/maemodeployconfigurationwidget.h
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentinfo.h
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	src/plugins/remotelinux/remotelinuxdeploymentdatamodel.h
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/ichecklib_global.h
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h
	tests/manual/ssh/tunnel/tunnel.h

Change-Id: I04d7761df6bd936ad00e0547974284c967d39580
 2012-10-05 21:20:50 +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
Eike Ziller
db4311d5b5 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	dist/gdb/Makefile.osx
	src/libs/qmldebug/qmldebug.qbs
	src/plugins/android/androidsettingswidget.cpp

Change-Id: I85627130b575f7d08f416dea52031fa72019b217
 2012-10-04 12:23:39 +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
Eike Ziller
a55d47544a Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	qtcreator.qbp
	src/plugins/qtsupport/baseqtversion.cpp
	src/tools/tools.pro

Change-Id: I43c391328ae747b3dc566f9db2384fedc1a6d0a5
 2012-09-26 10:01:04 +02:00
Leena Miettinen
1b575cb50c Doc: use same terminology as in the changes file 
List supported types of animated images.

Change-Id: Iae12c805db9bc69da97b842e79f1aa18a3d6ff5d
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2012-09-25 16:16:55 +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
Eike Ziller
b947861c59 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	qtcreator.qbp
	src/libs/QtcLibrary.qbs
	src/plugins/QtcPlugin.qbs
	src/tools/QtcTool.qbs

Change-Id: I3acea26888febe8f96d2131932266ed88b9f55f5
 2012-09-19 18:02:46 +02:00
Leena Miettinen
b0270f1fde Doc: new Compile Output pane functionality and button 
Change-Id: I0b4f68526b024a8e6c940672d9322822f2f98f76
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-09-17 16:32:06 +02:00
Leena Miettinen
c44074805f Doc: playing and pausing movies in image viewer 
Change-Id: Iad73768cdb8c0a57a1b8bccd3b9fb3afe1bcbb90
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2012-09-17 15:35:38 +02:00
Leena Miettinen
47f077a757 Doc: debugger commands in the Application Output dialog 
Update screenshot.

Change-Id: I129c73d2281d0a773abbea7ecb38756b1081deba
Reviewed-by: hjk <qthjk@ovi.com>
 2012-09-17 10:02:25 +02:00
Friedemann Kleint
811f3627d9 ProjectExplorer command line parsing: Handle directories. 
Prevent the editor from complaining about not being able to
open directories. Instead, check whether the directory name
matches a session or the the directory contains a project
file.

The idea is that one can type "qtcreator ." which results in
'Do what I mean'.

Change-Id: I45c5836567f8d1ff1024aca12db3603d6539d376
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-09-07 13:04:26 +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