feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
50,929 Commits 108 Branches 368 Tags
3b901b25a86f49ebef9be03ec762ed76422fd91c
Commit Graph

1109 Commits

Author SHA1 Message Date
Eike Ziller
0a1bdf4257 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	share/share.qbs
	tests/auto/icheckbuild/icheckbuild.pro

Change-Id: I13bc737c981aaeb615ab1a3571cc8a18f60a7cd6
 2012-10-25 10:45:58 +02: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
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
49d5c2381a Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	qtcreator.pri
	qtcreator.qbp
	src/libs/3rdparty/botan/botan.qbs
	src/libs/ssh/ssh.qbs
	src/plugins/qnx/blackberryqtversion.cpp

Change-Id: Ie8d16d636528aab4006310eab47a342fdf2634d9
 2012-10-18 10:40:11 +02:00
Leena Miettinen
43c2967fca Doc: update links on the Technical Support page 
Change-Id: Idca0e0ebdb846bf3613f1368b16611f09f583a64
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2012-10-17 17:07:48 +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
Leena Miettinen
dcbc4d8255 Doc: update Valgrind menu names 
Update screenshots.

Change-Id: Idf90ebcf06b4ee6a8b817ae47fad83fd9c2ae28c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2012-10-15 15:58:56 +02:00
Leena Miettinen
c120086726 Doc: Change Local Display Format option in Locals and Expressions view 
Task-number: QTCREATORBUG-7352

Change-Id: Ifbc1db45e591c27a12f7b215deab209857d08174
Reviewed-by: hjk <qthjk@ovi.com>
 2012-10-15 12:43:56 +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
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
a6ae3368eb Doc: Use debug version of frameworks (DYLD_IMAGE_SUFFIX=_debug) option 
Change-Id: I08dfb388a97953bf827d4b9f4355608278e3ea24
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-10-10 16:31: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
d5d1c5e394 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	src/libs/utils/fileutils.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/genericdirectuploadservice.cpp
	src/tools/qtcreatorcrashhandler/main.cpp

Change-Id: I830287691e7085fe9c94597e23ec7be64eb8be42
 2012-10-09 11:50:17 +02:00
Leena Miettinen
101085a488 Doc: adding system packages 
Change-Id: I66a91303d7ad683e83aae57fd8d3465ec8506ae3
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2012-10-08 15:07:06 +02:00
Leena Miettinen
480163efb4 Doc: move description of plain C projects 
The projects have been moved to non-Qt projects.

Change-Id: I98721458114c9cc92f7416ac37d6a37c4d77279b
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2012-10-08 14:14:36 +02:00
Leena Miettinen
43b20f8d75 Doc: fix a typo 
'desigm' should be 'design'

Change-Id: I885a5082c0517cca8e3f6cbe7ca40383ddee0cff
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2012-10-08 11:41:10 +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
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
Eike Ziller
68c796e244 Merge origin/2.6 
Conflicts:
	src/libs/utils/fileutils.cpp
	src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h
	src/plugins/cmakeprojectmanager/cmakeproject.cpp
	src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
	src/plugins/cmakeprojectmanager/makestep.cpp
	src/plugins/qtsupport/baseqtversion.cpp

Change-Id: I153295bad2d97609d96d28945e9f942c5b46b2da
 2012-10-05 20:51:31 +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
6f1f4f014e Doc: added some Mac OS commands 
The screenshots are now taken with a Mac and the text looked wrong.

Change-Id: I3b2358255eee752cdb6b0a21b7fb802916011771
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-10-05 13:50:01 +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
52eed97eaf Doc: remove Qt Simulator from the build and run example tutorial 
Change-Id: Iadb961ec0c74529f0afe278e5e46473e22c05979
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-10-04 11:16:02 +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
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
6faede0860 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.h
	share/qtcreator/qml/qmlpuppet/commands/tokencommand.h
	share/qtcreator/qml/qmlpuppet/container/reparentcontainer.h
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.h
	share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/nodeinstanceclientproxy.cpp
	src/plugins/git/gitsettings.cpp
	tests/manual/ssh/remoteprocess/remoteprocesstest.h

Change-Id: I00c294e6d911d272615e65fed58562399af97a4e
 2012-09-27 20:38:57 +02:00
Leena Miettinen
2207a9a987 Doc: QML Inspector was integrated in Locals and Expressions view 
Some functionality was removed. Update text and screenshots accordingly.

Change-Id: Iec9057ac17ddb1c3a27244c74038553f5ab46605
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
 2012-09-27 15:21:56 +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
069b5a536d Doc: memcheck requires a debug build 
Make terminology more consistent and add link to glossary

Change-Id: I46bbba560e14a917857cd89691986019d90b1550
Reviewed-by: hjk <qthjk@ovi.com>
 2012-09-18 16:41:03 +02:00
Leena Miettinen
61fb4f55c8 Doc: creating scratch buffers that use temporary files 
Change-Id: Id7d740ed587841eadfb9937fa6466647731761b6
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-09-18 12:37:41 +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
Leena Miettinen
b933c30275 Doc: building single files or subprojects 
Change-Id: Icfa99aac9af7cb76a2bfc60e3b4be9f7e8bc836e
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-09-14 15:36:38 +02:00
Leena Miettinen
eda3e211c4 Doc: updated changed fieldnames 
Updated screenshot.

Change-Id: I79dab92e7350def539989c62528a13fd9b9eef8f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2012-09-14 14:41:28 +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
9b6852ff0c Merge remote-tracking branch 'origin/2.6' 2012-09-13 13:16:07 +02:00
Leena Miettinen
c58569e163 Doc: using locator to open a file to the specified line 
Change-Id: Ic732bd32ccc16fe507b42db211e7d34ddb85b3dd
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-09-13 10:10:31 +02:00
Oswald Buddenhagen
e730e2bb8a Merge remote-tracking branch 'gerrit/2.6' 
Conflicts:
	src/libs/utils/environment.cpp
	src/plugins/android/androidtoolchain.cpp
	src/plugins/projectexplorer/gcctoolchain.cpp
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qtsupport/baseqtversion.cpp
	src/shared/proparser/qmakeevaluator.cpp

Change-Id: I554e96445a4d2b9ba0cc173ecd766091ee921aa2
 2012-09-12 17:27:37 +02:00
Leena Miettinen
f044873fb1 Doc: changes in debugger management for kits 
Change-Id: I3bfd3b0794281a4776437f9498bf4a7251f30c20
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2012-09-12 15:28:25 +02:00
Leena Miettinen
5aef98bb66 Doc: changes in the Debugger field in the Kits tab 
Update screenshot.

Change-Id: I980ad1396854ea4e59b26ccbc780de86469276fb
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2012-09-11 17:06:15 +02:00
Eike Ziller
5ac721dd58 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	qtcreator.pri
	qtcreator.qbp
	src/libs/utils/utils.pro

Change-Id: I6f0aba746f915d8c51dcf9372f7d9f593562fc2b
 2012-09-11 14:02:03 +02:00