Commit Graph

31174 Commits

Author SHA1 Message Date
Eike Ziller
97915bbcea Make 'open in other split' a flag instead of another method.
Change-Id: I1acafd85ec7a87ba2ac61240f30c329d56461118
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-06-03 09:32:22 +02:00
Petar Perisin
55e087ab05 Git: fix bug with Log and Blame not showing stuff correctly.
Task-number: QTCREATORBUG-9375
Change-Id: I4e18e4c2d4db71392aa305d49ffce924f8451a0b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-06-03 09:28:11 +02:00
Tobias Hunger
f8b052188f SVN: Add method to find SVN version and use it in svnDiff
We want to enforce the internal diff if possible, but that option
is only in 1.7 and later.

Task-number: QTCREATORBUG-9425
Change-Id: If89f0a7eedae51a04a5f1c40d48287a6425f7a12
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-31 18:51:15 +02:00
Tobias Hunger
de24f0170b Subversion: Remove code for SVN version 1.4
This was necessary ages ago for the mac. That comes with SVN 1.6.18
nowadays, so get rid of it.

Change-Id: Ie7dfc0acdd7670099fa6ccefc84867ba05d87b7c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-31 18:08:18 +02:00
Tobias Hunger
7b21f07cd4 Kits: Only make information on autodetected kits sticky
All others may not have sticky settings in the first place. This
fixes the name and icon fields always becoming disabled, even for
manually added kits.

Change-Id: Ie62ec6083586d65db851cee5d9a464e6c316be40
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-31 17:17:17 +02:00
hjk
22d358cb0a Debugger: Handle failed stop requests in LLDB interface
Change-Id: I79950d9a5114ee9810dc959412d1695015c083b1
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-31 16:52:46 +02:00
hjk
762e175e7c Debugger: Fix lbridge.py standalone startup
Change-Id: I47116fcce1c063a6a0af82ebac080f843d2d158f
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-31 16:27:03 +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
hjk
64458f1a23 Debugger: Simplify LLDB startup sequence
Change-Id: I17121fcce1c063a6a0af82ebac080f843d2d157f
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-31 15:58:41 +02:00
hjk
1dac4ba791 Debugger: Prepare assigning of values in LLDB interface
Change-Id: I722e78c352066ddd05e96199fd8ead088e3e9f59
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-31 15:58:26 +02:00
El Mehdi Fekari
a7fa0dd4b9 Qnx: Fix slog2er parsing when logs contain \n
If the logs contain a '\n' the message parts in the new lines are not displayed.
The new line messages are displayed with no buffer details and are ignored
when the parsing is processed.

Change-Id: I0e174dd5283a64c4e9b0434c06dd417f1be2c810
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2013-05-31 15:14:39 +02:00
hjk
2e3e11d00b Debugger: Remove unneeded code
Change-Id: I492e78c352066ddd05e96199fd8ead088e3e9f58
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-31 15:10:20 +02:00
hjk
c6b4a831bc Debugger: Give more thread details in LLDB interface
Change-Id: I352e78c352066ddd05e96199fd8ead088e3e9f58
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-31 15:09:57 +02:00
Orgad Shaneh
05a6fc48ba Git: Support change links on commit editor
Useful for commit messages with "reverts <hash>" for example.

Can later be extended for interactive rebase

Change-Id: Ibf77433ecddfacbd8d443636ddbc406bda474aa7
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-31 14:53:02 +02:00
Tobias Nätterlund
b90e3bbd8b QNX/RemoteLinux/Madde: Made device test more generic
Any device inheriting from LinuxDevice can now implement
a createDeviceTester() method to return their own
AbstractLinuxDeviceTester that runs when the device wizard
is completed, or when the Test Device button is pressed.

The MaddeDevice implementation of the device actions now completely
matches that of LinuxDevice, so those are removed.

The QNX device check was improved with additional tool checking.

Change-Id: Ie761b7cfc5591238aa2a18a74fe1843fb2cdbeaa
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-31 14:51:02 +02:00
Orgad Shaneh
f3eedaf300 Git: Warn when commits are not found
Change-Id: I5e03853f0b658d7f246538ca90e35f38cc2f49d4
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-31 14:44:46 +02:00
Orgad Shaneh
7b5b5b13b4 Ignore unconfigured VCS
Change-Id: I4a63734793debfcb37283257bb7cbf4b1153197f
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-31 14:41:55 +02:00
Tobias Hunger
7cf9312a4c Qbs: Do not list Qbs steps in non-Qbs projects
They can not work there anyway.

Change-Id: Ic643ae7e35ad599ffb3928530eafb6ec537f3f04
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-31 14:41:14 +02:00
Leena Miettinen
ba2d0fc929 Doc: hiding detailed progress information
Add an image that shows the current location of the
progress bar and the button.

Change-Id: I2292721e6215d056a6eedab3ed5dd9485ec0776f
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-05-31 14:11:02 +02:00
Tobias Nätterlund
cbb6db1232 ProjectExplorer/QNX: Add build step for checking device existence
This introduces a DeviceCheckBuildStep which any DeployConfigurationFactory
could use to insert a step to check whether a device is set up for the
current kit or not. Currently only used in the QNX deploy configuration.

If there is no device known to a QNX kit, ask the user
to add one. Launch the appropriate device wizard if the user agrees
to add a device.

Change-Id: I42db995f50890e2a2dd7aacc24a0049cdd6a6fee
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-05-31 14:02:00 +02:00
Tobias Hunger
316b9a36e9 Move comment into the right place
Change-Id: I296de582b4ddb706d9f5f3f7092654b3f5d79e46
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-31 13:56:46 +02:00
Eike Ziller
d2571548f8 Remove unneeded IEditorFactor::open re-implementations.
Change-Id: I261bc1ee09a2c22155e4874a4429a868d837c256
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-05-31 13:53:09 +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
7d986f0486 Cycle through extra editor windows when cycling through splits
Change-Id: I1bd5654d62b11456c35cc5bf1099e41fb3559bc7
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-05-31 12:27:12 +02:00
hjk
cb00983043 TextEditor: Move HighlightDefinition constants to where they are used
Change-Id: Ibdd3147cc2a64407802fa237b7943d2e96c90030
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-05-31 12:20:45 +02:00
hluk
fa022c0ae3 FakeVim: Share state with other editors
Change-Id: I1bcd3bb08745f838db9a1f6ef251f855da9ff315
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-31 11:08:04 +02:00
Sergey Shambir
d8eb5ddb75 CppTools: cleanup CppPreprocessor header, added short docs.
Change-Id: Ib61197da939165d24b99e40f29f9de13d109e044
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-31 10:53:18 +02:00
Orgad Shaneh
2d68f9c808 Git: Avoid version warning when Git is not found
Task-number: QTCREATORBUG-9411
Change-Id: I0bb90e508b78d0e7c7ff86fda72399036ad665ae
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-05-31 10:46:03 +02:00
hluk
55bb2e42fc FakeVim: Select/unselect line break in visual selection
Task-number: QTCREATORBUG-9289
Change-Id: Ic05b71491f8ed625df0ce514182eff916171666a
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-31 10:44:18 +02:00
hluk
2fb8590f87 FakeVim: Fix behavior of 'dw' command
Task-number: QTCREATORBUG-9289
Change-Id: I7ac1c925a13df49d60db410dce2d90b02cac7cfd
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-31 10:44:09 +02:00
Eike Ziller
80cef80910 Version bump.
Change-Id: I69393d9b2aca0e4a702af8385020547bf89ba6fe
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-05-31 08:52:47 +02:00
Eike Ziller
00f3fc2846 Make option for diff viewer in git options clearer
Change-Id: Iae0f427ed447430c82852c967022bc30ee4e88d1
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2013-05-31 06:23:36 +02:00
hjk
77ae4a8cb6 DiffEditor: Cosmetics
Add a bit of space around "Context Lines" label.
Remove extra spinbox frame.

Change-Id: I69533c2fa3e93473f41194bdc36ce07042df9855
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2013-05-31 06:23:07 +02:00
Petar Perisin
77c136646b Gerrit - Removed all patch set stuff
Change-Id: I013c116fc7e0ac1571513005b8ea49992e0771a3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2013-05-31 06:08:35 +02:00
Erik Verbruggen
f2631ad031 C++: do not strip trailing newlines in the preprocessor output.
Doing so resulted in an incorrect position for the EOF token when the
preprocessed output would be parsed. That in turn leads to incorrect
insertion positions for refactoring actions.

This is especially true when a file contains only preprocessor
directives: the EOF token would point to line 1 column 1, which is
usually not the place where code should be inserted.

Change-Id: I7d359aa7a6c04bc52c8b873fd49ad6afc3a77319
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-30 16:42:29 +02:00
Fawzi Mohamed
271a96b19a qmljs: moving all mime types into qmljstools
This reduces uneeded dependencies for modules that need the types
like the qbs module.

Change-Id: I59a6067a4c24a6d0401bf57fdfa8f5dc1f03595c
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-05-30 15:45:26 +02:00
Eike Ziller
e7f9a209ea Change log fixes.
Change-Id: I1edcf513d8d22dfc5abd87d0f339ea9d0b4015ca
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-05-30 14:41:56 +02:00
Eike Ziller
4d131257f9 Version bump
Change-Id: I3719f99180012d82af603134360fdd9eedab24f9
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-05-30 14:23:36 +02:00
Tobias Hunger
d080c54327 Qbs: Actually emit signal that parsing started
The logic to disable building depends on this signal.

Change-Id: I2341ddb70eebeb25c8c4ffdbbb1e5a83945fb971
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-30 14:15:50 +02:00
Marco Bubke
b97422b710 QmlDesigner: Add container item support in node instances
Change-Id: I30e0d11346b8c63188d052b46656e7ede179e55d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-05-30 14:11:57 +02:00
Christian Stenger
21c821806d Test: Correct path of loaded project for Mac
Change-Id: I91e0126b0f66e1635c6c1427d9f22842eeafcdd9
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-30 14:02:48 +02:00
Aurindam Jana
8b10d97767 Qnx: Add support for QML Profiler
Change-Id: Ib87a39177120458155bbb657ff8c9b09e1a6ccb5
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2013-05-30 13:56:23 +02:00
Eike Ziller
0a95b28147 Merge remote-tracking branch 'origin/2.8' 2013-05-30 13:48:27 +02:00
Eike Ziller
10d7d61e26 Merge remote-tracking branch 'origin/2.7' into 2.8 2013-05-30 13:48:02 +02:00
Laurent Montel
b0aa436fa5 Fix compile on linux + qt < 5
Change-Id: Iadb7df3cdb32180f78dace7bc11c7c673399c65b
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2013-05-30 11:56:16 +02:00
Eike Ziller
87bd3ead55 Add 2.8 changes file
Change-Id: I47121fcce1c063a6a0af82ebac080f843d2d157f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-05-30 11:48:40 +02:00
Christian Kandeler
b45fbc57f0 Fix qbs build.
Referring to non-existing files causes an error now.

Change-Id: I51aed8dfdcc92779158b284b849a34f259997e7c
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-05-30 10:47:14 +02:00
Petar Perisin
2b903b46d3 Git - added dummy locator actions
for Merge, Rebase, Show, Cherry Pick, Revert and Checkout.

Task-number: QTCREATORBUG-9405
Change-Id: I9a10d93382248ca86fe566bf1dccf4d390601aaf
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-30 10:21:36 +02:00
Fawzi Mohamed
8762dd2ea9 qmljstools: reset code model after update of exported cpp types
Task-number: QTCREATORBUG-9105
Change-Id: Id0021902985da8e5e7faec23766bb37541d041c0
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-05-29 20:13:14 +02:00
Thomas Hartmann
a05e63d7b0 QmlDesigner.Controls: updating sheets for Controls
Updating sheets for QtQuick.Controls:

* Adding enabled to Button
* Adding translation to CheckBox
* Adding translation to RadioButton

Change-Id: I7d312c19e14cd7d653f0878cbae8af66641aa7f7
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-05-29 18:21:09 +02:00