Commit Graph

33979 Commits

Author SHA1 Message Date
Fawzi Mohamed
cbf760686f qmljs: using QTC_OVERRIDE consistently
Change-Id: I37c96397014b7b710aeec629c5e715bba4997766
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-02-06 14:03:12 +01:00
Eike Ziller
30719c68fa TextEditors: update parentheses highlighting when font settings change
Change-Id: Ia9c43d52116a337abee8704f9fbbe80a56029caa
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-02-06 13:41:27 +01:00
Eike Ziller
5f94bc4d12 QmlJSEditor: Move semantic highlighting to document
This ensures that we are only highlighting once, and actually do
highlight (the previous code was trying to prevent multiple rehighlights
though doing the highlighting in the editor(s), resulting in situations
where it wouldn't rehighlight at all)

Change-Id: I18f3e72e31d8076b6d1575f1a17a3f4a101163d9
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-02-06 13:15:22 +01:00
Eike Ziller
99dec87406 TextEditors: Generalize update mechanism when editors become visible
Generalizes the special handling of font settings, which should only be
applied (on the document) when an editor is or becomes visible.

Change-Id: Icd1e3ba4355e1ff4a837c9679b537cc3f5ed7ea9
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-02-06 13:14:56 +01:00
Orgad Shaneh
757a5a2867 Git: Detect rc versions
Rename local vars to avoid collision with macros defined in
<sys/sysmacros.h>

Change-Id: I6da7354102cca898d2600296242131e4c343c019
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-06 11:10:09 +01:00
Lorenz Haas
ad33b33ff1 Core: Fix exit strategy
Fix break condition for a while loop and add some "const".

Change-Id: I62abe4701d6d919428266772867f4bc6c7c43759
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-02-06 10:49:23 +01:00
Eike Ziller
db897f8146 Fix build on Windows
For some reason it doesn't like signals with QFutures. Going back to
pointers, but copying the future from there when it's used.

Change-Id: I8dea0817b4e59ede6874ab8be01f22a92e7402a0
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-02-06 10:49:04 +01:00
Christian Kandeler
0f9827e4a5 Device support: Provide SSH connection parameters in internal variables.
Example use case: User is developing for embedded Linux system without
an SFTP server. Now deployment can be done via a custom process step
using scp without the need to duplicate all the connection data.

Change-Id: Ib1f71080d106864e5f5345fd36f7cc226a515916
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-02-06 10:21:13 +01:00
Friedemann Kleint
fe13d33907 QNX: Fix compilation with Qt 4.
Introduced by b254313c68 .

Change-Id: Ib1b41da58eef97f5fe961ca12bcfcabeae4fd523
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-02-06 09:05:53 +01:00
Eike Ziller
783d6ebbd2 Avoid duplicating editors too often.
It was duplicating editors even if an editor for a document was already
available in the view, if that editor wasn't currently on top.

Task-number: QTCREATORBUG-11395
Change-Id: I89a2d5ef0285d8aa34642567fbf122a98e87e75e
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-02-05 16:15:44 +01:00
Erik Verbruggen
58af02f074 C++: release more futures.
The CPPEditorWidget retained two futures, as did the attached future
watchers retained them too. Together, each future and the watcher held
on to a complete snapshot that would only get released when another
future was set. This could result into retaining old snapshots in
editors that were invisible/unused for long.

Change-Id: I1133e857c620437b4a69b9dad468f6bd458304b8
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-02-05 15:42:46 +01:00
Orgad Shaneh
4089012735 GenericHighligher: Preserve whole context on LineContinue
Task-number: QTCREATORBUG-11063
Change-Id: I5f23a2a1f1db370e732c1a101a6581fa5c493085
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-02-05 13:46:44 +01:00
Orgad Shaneh
ddab33545c Lexer: Skip also joined comments
Change-Id: Ic854958642bf1eedeb7d90ae74fb72993594b8d6
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-02-05 13:29:00 +01:00
Petar Perisin
1bd1217da7 KitChooser: set size policy
So that button would remain fixed size when expanding.

Change-Id: Ieab77cc2d12200ff7b4f63b69e1657a52106127e
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-02-05 12:49:34 +01:00
Frantisek Vacek
b254313c68 QNX: Use BarDescriptorDocument API to prepare bar-descriptor for deployment
Patch is refactoring create package step to use new BarDescriptorDocument
class when bar-descriptor.xml is prepared for deployment.

BarDescriptorDocument API is extended to allow this.

Change-Id: If00fba3310c5acf1cc8feefe0cf919aa2a05637e
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2014-02-05 11:39:48 +01:00
Christian Kandeler
e24b5c17d6 Android: Remove unneeded include.
Change-Id: I47be2a7ba17c53054084e576f62ad163832f2940
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-02-05 11:33:33 +01:00
hjk
b7ec5fb375 Clang: Coding style
Change-Id: Ib7dc759e8db7cf37fbcd7f75d28b29bf95593d6c
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-02-05 11:18:51 +01:00
hjk
944d80dcdc Clang: Adjust singleton access style to more recent use.
Change-Id: I7d98f598b1c7f7b871a862ec121b83128d8b2752
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-02-05 11:18:44 +01:00
hjk
d963ad4167 Debugger: Work around wrong executable names
We currently don't always get proper executables from
the process list, and we don't need them for attaching.

Task-number: QTCREATORBUG-11295

Change-Id: I2fc18df0db85063146ed9dc09351844924e22bdc
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-02-05 11:18:31 +01:00
hjk
bb44eca27d ClangCodeModel.pluginspec: s/Nok/Dig/
Change-Id: I3e7bc182350702c72a99389ff4b92ad58de8efe6
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-02-05 11:18:16 +01:00
hjk
0edf62e533 Clang: Simplify some condition
Change-Id: I4d68734b2d30d7922359020ea2c64d764d6efb7a
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-02-05 11:18:05 +01:00
Friedemann Kleint
da247aac2a Debugger/LLDB: Fix build on Windows.
Change-Id: I7cf64967f0fc5cc54d59b88ed08c445781ec56e1
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-02-05 08:44:50 +01:00
Orgad Shaneh
f4f8f97258 CppEditor: Hide only functions that are implemented in the target class
... in Insert Virtual Methods

Change-Id: Ifc5ece2e98c316190331f56187fe39954e49b519
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-02-04 22:31:53 +01:00
hjk
f94249350d Debugger: Make simple manual test use C++11 also with Qt 4
Change-Id: I6c5d891cc3b3ed1afdf12e2dc08d35e10f190c01
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
2014-02-04 19:27:58 +01:00
Alessandro Portale
076496a122 Revert "WelcomeScreen: Changing the "Getting Started Now" button url"
wrong branch

This reverts commit c3e675064c167eee79c04837015641f5af20a012

Change-Id: I2a24c89e4953e69057b8e125a4be18410ee6005b
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-02-04 18:02:48 +01:00
Robert Loehning
57b63f4fdb Added test for Abi::abiFromTargetTriplet()
Task-number: QTCREATORBUG-11409

Change-Id: I176c38dccdc1af6fde4298d6413fe827f27cc4b0
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-02-04 17:06:01 +01:00
hjk
b9834e4092 Debugger: Move special argv display to DumperBase and use for LLDB, too
Change-Id: Ie1913f5a5062d230e02a4f1738ca14bd6cebc55c
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-02-04 17:02:38 +01:00
Eike Ziller
0eae696743 Mac: Don't fail with error if deployqt is called multiple times
Change-Id: I19753fab58dae1e430adc76b96af4ef7ea690995
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-02-04 16:38:23 +01:00
hjk
b7c7a82060 Debugger: Pass command line parameters with LLDB
Change-Id: Id25155688e0e9bbe0d45cde20563929b7370695d
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-02-04 15:49:12 +01:00
Daniel Teske
c0dda8b2bb AndroidManifestEditor: Make widget better at resizing to small sizes
Task-number: QTCREATORBUG-11394
Change-Id: If2c18df0db85063146ed9dc09351844924e22bdc
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-02-04 13:23:46 +01:00
hjk
c3c84c7b39 ProjectExplorer: Recognize -android- in target triples
Change-Id: I345811bb02dd626fc1cb3449fed971b97fcaf976
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-04 13:16:00 +01:00
Orgad Shaneh
7febebc294 C++: Fix indentation in preprocessor tests
Easier to compare when indentation is aligned

Change-Id: I216073dc167c0ed785616ae308b566db7f910592
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-02-04 11:34:03 +01:00
Orgad Shaneh
e600424648 C++: Fix support for incremental input with \n
Also fix false positive line continuation on blank line

e.g.
"foo \

bar"

Change-Id: Ic6d345a4b578c955411d119b8438c8dc5065c072
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-02-04 11:33:54 +01:00
Orgad Shaneh
fd31b4716c CppEditor: Remove final functions from virtuals tree
Change-Id: I2daad43539927e012af23b19dbca00f3aaa644e2
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-02-04 11:33:42 +01:00
Orgad Shaneh
d89d26ab4d CppEditor: Enable choosing any override in Insert Virtual Methods
Change-Id: I839cfeb2650f991bcf9660e5ccbfa52452917eb8
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-02-04 11:30:26 +01:00
Orgad Shaneh
524c37112f GenericHighlighter: Make tests independent
Change-Id: I30c3551badb503013e62a0635f04d7aae6168f4e
Reviewed-by: Leandro Melo <ltcmelo@gmail.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-02-04 11:30:19 +01:00
Eike Ziller
5081d032cb Mac: Deploy libclang if needed
Change-Id: Ia60d4bc3fd8899da51e3c71ef6a514fb3f52f1e2
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-02-04 10:56:25 +01:00
Fawzi Mohamed
f5e7526a33 binaryeditor: fix reload
Task-number: QTCREATORBUG-6275
Change-Id: I94a9b8fcf0ce194b251ffaaa7ff14542cbbd1659
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-02-04 10:22:32 +01:00
Eike Ziller
d538235885 QmlJSEditor: remove leftovers from semantic info updater move
Change-Id: Ib93a66f56ecd7a1324195e817f14280fcc0c3625
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-02-04 09:59:02 +01:00
Eike Ziller
a94d736881 TextEditors: Avoid sending contentsChanged signal when rehighlighting
That avoids a complete reparse of the document when font settings
change, but in turn now requires an explicit redo of semantic
highlighting in that case.
The cpp editor part of this patch is actually still doing semantic
parsing though. This will be fixed up in a later patch.

Change-Id: I6f51a18cba6325856c96e155700eb912f6d3aad5
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-02-04 09:58:51 +01:00
Eike Ziller
d653d600e0 QmlJS semantic highlighter: Use document instead of widget
Diagnostic ranges also move to document for this.

Change-Id: I82a9909abb57594cdd732448270849e6a2e3a4e0
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-02-04 09:58:40 +01:00
Thiago Macieira
f1606a9f58 Normalize signal & slot signatures in connection
Profiling shows Qt Creator spends 2% of its load time normalizing

Change-Id: I7c38825875c8db58813792dcb86b3a88945466f7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-02-03 20:19:44 +01:00
hjk
10f0044031 Debugger: Allow incremental expansion of large stacks
Task-number: QTCREATORBUG-11108

Change-Id: Id1a155688e0e9bbe0d45cde20563929b7370695d
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-02-03 14:12:58 +01:00
Christian Stenger
22f9d58b0d Tests: Fix compile
Compile error was introduced by 0eea7ca90b.

Change-Id: Ie3f7a95a84d7774e85845abd6288b254ebd24c5a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-02-03 10:59:24 +01:00
hjk
871a4bcad3 Debugger: Re-structure version check in QDir dumper
Change-Id: Ic14155688e0e9bbe0d45cde20563929b7370695d
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-02-03 07:56:57 +01:00
hjk
5ea71557be FakeVim: Don't touch cursor on focus in.
Change-Id: Ic8199fc14089717a6b121b384ddc0bbc606a5fb7
Reviewed-by: Lukas Holecek <hluk@email.cz>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-02-02 21:14:59 +01:00
Orgad Shaneh
92a133b09a Git: Increase limit in LogChangeDialog to 1000 entries
Task-number: QTCREATORBUG-11200
Change-Id: Iff6073c4f84926a18006c1f47b30a0525134c2ba
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-02 06:44:34 +01:00
hjk
3e4cc08699 Debugger: Yet another way to extract metaobjects
FindFirstGlobalVariable seems to return bogus values.
EvaluateExpression might be more reliable.

Change-Id: Ic84155688e0e9bbe0d45cde20563929b7370695d
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-01-31 18:14:00 +01:00
hjk
b2874f3bb3 Debugger: Make some gdb dumper work for libc++
Better user experience on Mac.

Change-Id: Ice1455685e0e9bbe0d45cde20563929b7370695d
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-01-31 17:11:02 +01:00
Robert Loehning
667390f8da Provide parent to getOpenFileName()
Change-Id: I0c364c647c1198c81e5ec9582738dc1aacc92d7b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-01-31 16:49:44 +01:00