Commit Graph

31523 Commits

Author SHA1 Message Date
David Schulz
9d3f12f24f Editor: Remove trailing whitespaces in generated files.
Task-number: QTCREATORBUG-9833

Change-Id: I7440d1e7c8ef303db1b6abfa8cd12325b934b0d2
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2013-08-12 14:16:59 +02:00
hluk
d15fb5a75c FakeVim: Emulate search more precisely
Submitting search highlights (if 'hlsearch' enabled) in visible editors.

Update highlights after 'nohlsearch' command, 'set hlsearch' and
changing document.

Change-Id: I66ed8c6e9c6e99f3c64f91cdec5ac5feb636d2cb
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-12 13:43:36 +02:00
Aurindam Jana
91e6d27a73 QmlConsoleItemModel: Remove redundant method
Change-Id: I8342ee560bb2a9dc57cdccc3815f04d57ec3cd05
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-08-12 13:36:31 +02:00
hjk
a710f7f8c0 Analyzer: Move setIfPresent helper function close to the only user
Change-Id: I8d99fe6438e4d954ad44403ac4a34f7e85a7f021
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-12 13:21:48 +02:00
hluk
2890242df5 FakeVim: Fix checking if text was re-inserted
Change-Id: I213ad5c9d6f8d313f07daaceb253a7d03b9035a3
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-12 13:10:15 +02:00
hluk
d935b4cfc6 FakeVim: Use QTextDocument::availableUndoSteps() for undo/redo
Partially reverts commit b9cc16e405.

Using QTextDocument::revision() to keep track which undo/redo command
should be used next doesn't help much and it's more difficult to use
than QTextDocument::availableUndoSteps().

Task-number: QTCREATORBUG-9784
Change-Id: I656e1e964477de0f387c80b9384a32e0d8dab39f
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-12 13:06:58 +02:00
jkobus
a03112d2f6 Fix id of diff editor according to change b772001c
Task-number: QTCREATORBUG-9960

Change-Id: I233b697254e863b7c4389c0041104b82e97bd340
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-12 12:59:53 +02:00
hluk
1843d5ab67 FakeVim: Check first character on line with 'F' and 'T' commands
Change-Id: Icd5c3ca62da0fbff35e2281e04b1fa37a304f64c
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-12 12:50:50 +02:00
Daniel Teske
9e10b05366 Android: Ensure that keytool returns english output
Task-number: QTCREATORBUG-9941
Change-Id: I69c3f6aecdf5e4c40934b5151518a0787b752356
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-12 12:44:29 +02:00
Carl Simonson
75ce70a862 FakeVim: Add another key binding for vsplit
Vim allows for spliting veritcally by typing <C-W><C-V>. Add this
keybinding.

Change-Id: I7db5a8cd06eea05b011655ec326b3795f0896ed9
Reviewed-by: Lukas Holecek <hluk@email.cz>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-12 12:42:56 +02:00
Orgad Shaneh
b0d14c79fe VCS: Use correct output style
Change-Id: I95ea8078ae53e7339213765fbb8a79bff33f899c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-12 12:42:11 +02:00
hjk
e2aa5b53cf Debugger: Add dumper for QIPv6Address and Q_IPV6ADDR
Change-Id: I85d8a484fdc3a265aa736d6a2f38ff955af8e138
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-08-12 12:41:57 +02:00
Orgad Shaneh
b26ef7e6cd VCS: Emit repositoryChanged on some missed cases
* If command fails - it might fail due to a conflict.
  That doesn't mean the repository hasn't changed.
* On runVcs

Change-Id: I0acd33a330c90d7c4f0df1f113ef2852eaf0ad03
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-12 12:41:54 +02:00
hjk
5fa7b60b97 Analyzer: Cleanup settings handling
More flexible, less over-engineered this way.

Change-Id: I3e224a6be85d3a187056d79fd506e8cf6a32c8a9
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-08-12 12:39:54 +02:00
Daniel Teske
2d4afd0494 Android: Clean up before packaging, be a little bit more careful.
The android/libs folder contains both the library from the project and
libraries from qt. This adds a small check before removing libQt5*.so,
that checks if that file is in qt's lib folder. That fixes the bug
below, but e.g. naming your project Qt5Test won't work.
Long term we'll need to overhaul the packaging and make that more
robust.

Task-number: QTCREATORBUG-9895
Change-Id: I48f735114ee95668a862549cfe1537aeab968dfb
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-08-12 11:41:35 +02:00
hjk
1c5c51c91d Debugger: Disable # characters in watched expression
They are not useful and break the dumper protocol.

Change-Id: Ice7e21575e371ee3f8bb8cfb80b73aed47542932
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-10 21:23:00 +02:00
Christiaan Janssen
0a3b20f5f9 QmlProfiler: reworked
Change-Id: I66a236a024d76e7bef6edfb91ae30b5dd098b76b
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-08-09 17:19:32 +02:00
Christian Kandeler
7764f35107 RemoteLinux: Fix typos in tar packaging step.
Change-Id: Ic598eba24da514d56e5e16c443788bd17a670ba5
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-09 15:26:02 +02:00
Tobias Hunger
5f00bafb1c Qbs: Better support for consoleApplications
Change-Id: I673196c668b53a9b53065438ed860048eb1307ca
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-09 15:25:30 +02:00
Tobias Hunger
27b4802988 UiCodemodel support for qbs
Change-Id: I0c83f3bb5c1c127169d695f42c169f4e28d1b06d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-09 15:24:35 +02:00
Orgad Shaneh
97d76b8cbf Fix qtchooser resolving on fromMap
Task-number: QTCREATORBUG-9841

Change-Id: I5b41bc897fd0249887f0ab4d55383cd5c7545b22
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-08-09 14:28:44 +02:00
Daniel Teske
97ececbbd6 Qt4Project: Only complain about missing subdirs from the exact parse
Task-number: QTCREATORBUG-8941

Change-Id: Ie843529e42ede29d607932d5fbd9e92da2fd8082
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-08-09 12:47:32 +02:00
Christian Kandeler
b71b7f140c Update qbs submodule.
Change-Id: I178d4a50d03ca6ed53a945140f045a721286d2ba
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-09 12:21:00 +02:00
Erik Verbruggen
d934ca77da Generic project manager: assume C++11 for cxxVersion.
Change-Id: I40bd4b73d93eaf71d1dfbf7c9c1572f0cb796bd9
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-08-09 11:48:43 +02:00
Tobias Hunger
a2225cb2ef ProjectExplorer: Remove references to Qt4ProjectManager namespace
Change-Id: I384110b5aa91aec903af3b4bb2a158e1f0d4c918
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-09 11:37:43 +02:00
Tobias Hunger
41c9a047b8 QmlJS: Fix grammar file
Do not reintroduce clang warnings when regenerating code from
the grammar file.

Change-Id: Ic065191b93e68d88792fedac9784e4fbeff08d6f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-09 11:33:06 +02:00
Tobias Hunger
886e1a72d1 QmlJSParser: Fix build issue with clang
Erik promised to fix this upstream.

Change-Id: If78e7eee20188d3be77ca9e7e53714ea5740d4d8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-09 11:21:19 +02:00
Tobias Hunger
0796684558 CustomParser: Improve strange operator != implementation
Change-Id: I42c195004a9eca9f03cf34bd274f473ed87c580e
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-09 09:54:40 +02:00
Daniel Teske
f1eb9c4827 TextEditorActionHandler: Simplify code
Change-Id: I44f1859b6d91e20a2a15146c6587e4a51c70aa90
Reviewed-by: David Schulz <david.schulz@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-08-09 08:05:37 +02:00
Tobias Hunger
3e62b80bf9 Qnx: Compile fix
Change-Id: I77e6182a6b908857d7bc382582915b88cc2e78e2
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-08 18:47:47 +02:00
hjk
84a28d1ec0 Analyzer: Fix recent regression in aspect creation
Introduced in 15caea1d26.

Change-Id: I04da456928aa2bbf30467770d5a9da35c0e87d9f
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-08 18:16:45 +02:00
Christian Kandeler
2d05c9a2f4 ProjectExplorer: Add missing namespace around CustomParserConfigDialog.
This also fixes compilation with namespaced Qt.

Change-Id: I74c15a97c81cc414d1d850cb0dabf72014c7ff6b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-08-08 18:11:55 +02:00
hjk
e94183ca2f Analyzer: Introduce AnalzyerAction
This wraps the menu related aspects of an IAnalyzerTool.

Change-Id: I065cb5f269a40af2137f434a7cdf915bd9a76839
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
2013-08-08 17:41:39 +02:00
David Kaspar
256509541b Qnx: Device auto-detection in Add BlackBerry Device wizard
BlackBerryDeviceConfigurationWizardSetupPage auto-detects devices
that are reachable from a host machine and allows an user to choose
one of them to pre-fill the fields on the page.

DeviceListDectector class added for auto-detecting devices.

BlackBerryNdkProcess::resolveNdkToolPath() method added to allow
resolve cmd-line tools fill path.

Change-Id: I58287b40a5f20662fc09665c3a3c492294bb57f3
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
2013-08-08 17:26:13 +02:00
Daniel Teske
b849f64bbe TargetSetupPage: Prefer the default kit for the active target
Change-Id: Ia57685e7ffc5f9d45777731d24e5c8d218a4d5a5
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-08 17:21:41 +02:00
Daniel Teske
70e1aad041 QMake: Also check for QtChooser in DesktopQtVersion::fromMap
This is only done for DesktopQtVersions, as I believe that only those
are affected by this.

Fixes more issues described in

Task-number: QTCREATORBUG-9841
Change-Id: Ifb7a797e71c812daef5bc5139bc339fb11423c15
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-08-08 17:20:52 +02:00
hjk
f959990ab1 QmlProfiler: Use real type instead of base class
Change-Id: I854834b2236a99af264d14a3d6022bfa6e0a2b9b
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
2013-08-08 16:18:09 +02:00
hjk
4d87da89ca CustomParser: Compile fix with namespaced Qt
Change-Id: I1e84ff126e50052cd1990f33a7b85d19fc4f3b13
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-08 15:54:18 +02:00
Christian Kandeler
8e31fde79b Fix Windows build.
Was broken by b055c0e506.

Change-Id: I3c39dbfcf5ddd72e15fc97d3d4df9073824dc391
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-08 15:52:59 +02:00
hjk
84331769f0 Analyzer: Re-introduce ValgrindTool level
This partially reverts 1fb755bb42. It turns out that this is a better
place to have the valgrind specific startLocal/startRemote logic
shared by the valgrind tools.

Change-Id: I1638b6d7665db81227e0a1a9aeef1ce944449391
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2013-08-08 15:51:54 +02:00
hjk
15caea1d26 Analyzer: Handle createProjectSettings outside IAnalyzerTool
Less indirection.

Change-Id: If702a0a44c1fc96510fd1c5411fda51660dde10b
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2013-08-08 15:46:57 +02:00
Tobias Hunger
2e0434dd25 Git: Fix possible core dump
Change-Id: Ieb822c8810e8943d5397e6c64188690e481dd0f9
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-08 15:31:04 +02:00
David McFarland
d16706fc13 Use install path instead of source for android deployment
Change-Id: Ibb63b6077054b75566c6daac722f32f106b5049b
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-08-08 15:17:24 +02:00
Christian Kandeler
b055c0e506 Device support: Rename DeviceProcess to DeviceProcessItem.
We want to introduce a new class that has more right to that name.

Change-Id: I9535632e10872a97a8555e885a80c383bc5dcd2b
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-08 12:24:40 +02:00
Nikolai Kosjar
2665a1249b CppTools: Do not garbage collect files in the working copy
...except the configuration file if no projects are open. For this case
there is no need to keep the configuration file around.

Task-number: QTCREATORBUG-9829

Change-Id: I51b01b30c17cbc1ced491ef2c47c338dae6ed983
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-08-08 12:12:31 +02:00
Nikolai Kosjar
7583039b87 CppTools: Do not call GC() more than necessary
Currently GC() is invoked if
   - 5 CppEditors were closed or the last CppEditor was closed
   - a project is about to be removed
   - a session is about to be unloaded

Thus, for the following use cases, too much GC() calls (can) happen:
    - File > Close All
    - Close All Projects and Editors
    - Changing the session

Fixed by introducing a timer.

Change-Id: I9c984d9de735fc8c6ee77a518e9fb5b63dba5881
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-08-08 12:12:08 +02:00
Andre Hartmann
4bc61ecac4 Custom Error Parser
Allow setting the following items from outside:
* capture regular expression,
* file name, line number and message capture position and
* whether to parse stdout, stderr or both

The parser functions can be unit-tested by running (Debug build of Qt
Creator needed):

qtcreator -test ProjectExplorer,testCustomOutputParsers

The data is passed to the custom parser in
CustomToolChain::outputParser().

The parser information is stored in toolchains.xml together with the
custom toolchain. A configuration widget is provided to set up and test
the regular expression against a sample error message.

Change-Id: I6191df3c44432943e0aeb16c48d8e79d35845d2e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-08 11:50:08 +02:00
Nikolai Kosjar
83bbd534e5 CppTools: Do not try to find definitions of generated symbols
This speeds up the quick fix InsertDefFromDecl on function declarations
in classes containing Q_OBJECT.

Task-number: QTCREATORBUG-9877

Change-Id: I0af16f17f40735040b7158a3191c13db3433edf9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Lorenz Haas <lykurg@gmail.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-08-08 11:49:42 +02:00
Christian Kandeler
9249175a4b SSH: Remove questionable warning in connection manager.
If there are still open channels in a connection being released,
that is not necessarily a mistake: The channels could already be
in the closing state, and it would be unreasonable for us to expect
API clients to always wait for confirmation before releasing the
connection, as this can complicate code quite a bit, turning a
synchronous operation into an asynchronous one.

Change-Id: If8c604c9ee1294728e7947c8d5c8130d6e704b49
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-08 11:46:35 +02:00
Orgad Shaneh
578d18691a SynchronousProcess: Replace last QByteArrays with QStrings
Matching \n in a QByteArray is wrong. For example, it detects Ċ (U+010A)
and ਛ (U+0A1B) as end-of-line

Change-Id: I9c03d0b19da3d328e706ff2c89f09713be870f34
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-08 11:15:59 +02:00