feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
32,973 Commits 108 Branches 368 Tags
cf5ec760f61522ce0387b5ea44b017459c200ab8
Commit Graph

480 Commits

Author SHA1 Message Date
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
34edc737c7 Doc: deployment settings for generic Linux devices 
Change-Id: Id26adb0ea37e258680dd61f9d0b50b8f9c90ef45
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2013-01-24 10:52:36 +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
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
Petar Perisin
39e9c5ef20 Editor: Allow to open links in a new split. 
This changes current behavior while opening links. Link is now opened in
next split by default. If you use CTRL+Click to open links, it will also
open in next split. However, by using CTRL+ALT+click it will open in
current split.

There are two new checkboxes in Tools/Options/Text Editor/Display:
- "Open Links in New Split" - if it is checked, links will not be opened
in current split. However, if document with link is already opened, it
will be used to open the split
- "Force open links in next split" - Links will always open in next
split, even if their document is already opened somewhere else.

Task-number: QTCREATORBUG-8117
Change-Id: Ib99075b55d9e9683ed2c2386767227457de0a3fc
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-01-11 12:48:44 +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
Leena Miettinen
c977562bca Doc: remove references to Qt Quick example 
Do not use the Clocks example in the tutorial for building
and running, because it is not delivered with Qt 5.

Change-Id: Id3a81cf0ef01d05de1e287ac1e12cc07bdacbaf1
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2012-12-17 15:06:15 +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
Francois Ferrand
058d2e8cb5 Support preserving case when replacing. 
When making a case insensitive search, try to keep the string capitalization when doing
the replace:
      - All upper-case matches are replaced with the upper-case new	text.
      - All lower-case matches are replaced with the lower-case new text.
      - Capitalized matches are replace with the capitalized new text.
      - Other matches are replaced with the new text as provided.

Note: this does not work with regexp replace, only plain text.

Change-Id: I87cbc28eb64688bdf3c8c6ec173fcb22f91abcd0
Reviewed-by: Cristian Tibirna <tibirna@kde.org>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-12-14 10:22:41 +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
hjk
2e01daa2a0 debugger: adjust reference to startup commands to reality 
Change-Id: I4369de839eba8cd30d261b74e89f2363ca815926
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2012-11-20 14:39:34 +01:00
hjk
2c7f0cb828 debugger: mention drawbacks of using putCallItems in dumpers 
Change-Id: I8f93113d54f9a696ca80661efd4d5e11872ea622
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2012-11-20 14:33:03 +01:00
Leena Miettinen
440b3f49ff Doc: new Qt Quick 2.0 file wizard 
Task-number: QTCREATORBUG-8236

Change-Id: Ibffcae0d4b9d25801d23d2fa0d84ed7fe444feb5
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2012-11-19 16:32:41 +01:00
Eike Ziller
fe74a9a722 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/fakevim/fakevimhandler.cpp
	src/plugins/qtsupport/baseqtversion.cpp
	tests/auto/cplusplus/cxx11/cxx11.pro
	tests/auto/cplusplus/cxx11/tst_cxx11.cpp
	tests/auto/icheckbuild/icheckbuild.pro

Change-Id: I3c8351ad35617f56d15b788c8a46d8a6f453ef70
 2012-11-09 11:20:10 +01:00
hjk
de1d0532d0 Doc: mention the snapshot view of the debugger 
Change-Id: I40837f84b8755e774f1c63ea38337e5b906204ee
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2012-11-05 13:39:39 +01:00
Leena Miettinen
bbbac40bec Doc: replace shortcut to File Naming options with menu path 
The shortcut seems to have been removed.

Change-Id: I1322feb44fb4b62d30c256e53ab056b5210a4ad0
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2012-10-31 16:24:57 +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
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