Change-Id: I9d0abacbd1b503390164934a1b833fd305ae3fbe
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Change-Id: I4297651458f6efb28a3bbeb83b4c038956d64305
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Change-Id: I7c2dc83143aab2c2c0e16736dd26c53c75de024a
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Change-Id: I4caadbf4675fd4fbb0cbb6a1d4fa711c3520a440
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>

Change-Id: I41eda91149c0152fd0b9f3d2c0294120153377b5
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>

The hash type is recorded as char if the std::unordered_map
key is a std::string.

Change-Id: I08f2ad9e46c88302d523b879558f65b4a86b0e2c
Reviewed-by: hjk <hjk121@nokiamail.com>

Change-Id: I4799791b2baffa61092c01699a4128f01151b53c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

Task-number: QTCREATORBUG-11250
Change-Id: Idba517091a633f8ff57df5a6f42fe0f03a35142d
Reviewed-by: Robert Loehning <robert.loehning@digia.com>

* Add a bbndkconfigurations.xml file to store BlackBerry user configurations
* Save both manual and auto detected user configurations
* Mark invalid configurations in the BlackBerry settings widget
* Provide a cleanup user action to clear invalid configurations

Task-number: QTCREATORBUG-11004

Change-Id: Ibb29aa5010317f62233865d42d6ca4ae3afa0de3
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

This fixes the problem of Qt Creator not getting the cxxFlags set in
Qbs.

Task-number: QBS-481
Change-Id: Ie233123d62bcf89f3b8ebee1367ca6447b9ade3a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Create Tasks in such a way that they have the correct TaskType from
the start. This makes sure the icon chosen by default is the correct
one for that type and avoids the need to override the icon again later.

Change-Id: Ic47f1d119a7d8f85fcb6f2ee9aaaeadf074f8348
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Introduced by a3608f59

Task-number: QTCREATORBUG-11267
Change-Id: I1cb09dd18ed49fcbbfe0d9890d971e7ca4e93ba5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

Change-Id: I018682bfb6bfc9fec77f8e4996cff5b6fd15c526
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Change-Id: I4511c26af7b02fb0ffab76e5170e80d6cf79b10b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

* Works around QTCREATORBUG-9453
* Triggers completion on Key_Down with empty prefix
* Replace current filters in HistoryCompleter and FancyLineEdit

Change-Id: I56bfd4e0ee969c5ae674de2f2de1081fcf6dc176
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Fix regression introduced in 921f86df

Change-Id: I5a45d7c94e9a296ae7331d53c979bcb03f864e13
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: I6b43bc4013e38b6db2c57b8a4a7aba917f71c1ff
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>

...after conflicts resolving

Change-Id: I02637e19d1f5b595b2c63d8e001c0df6af94a347
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Anchors are supposed to reduce graphical glitches such as the gradient
borders getting detached from the edges of the timeline while resizing.
I'm not sure if it's actually better like this, but the code certainly
looks nicer.

Change-Id: I9eb6a6a50780ce642ad7cb551d2895a80b00690e
Reviewed-by: Kai Koehne <kai.koehne@digia.com>

Change-Id: Iaff416c1af61e20e47309b7ec34bf4ab0d3f4267
Reviewed-by: Kai Koehne <kai.koehne@digia.com>

Change-Id: I365e4c56b45dda205caa009e7733579d40bca9d0
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Change-Id: I9b9081df454aae35c42744f4bbd385e8bd6c50d2
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Change-Id: I4f71448d6788a4e553b1495b72263a004e65d8c0
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

It's not necessary, since we have signals for that. And it's wrong to
handle the additional preprocessor directives there anyway.
The update if the editor supports objective-c/c++ is now done in a
mimeTypeChanged signal handler, the update of the additional
preprocessor directives on filePathChanged.

Change-Id: If88c70f5321c2bc21a21673e96be2598dc9ecf04
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Change-Id: I523735bae9e1a19678d4ab697c1edce2886bedeb
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Change-Id: Ic935a8971705cb3238deda71aa2b5d19e4f62593
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

The tool bar should not be a direct child of the widget that is searched
(i.e. that has the FindSupport attached).

Change-Id: Ib6b17c4d2df39798086ae41d1b3a0e394e7afa75
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Change-Id: I7053310272235d854c9f409670ff52a10a7add8b
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Change-Id: I3078002359871dad74d4a07924d5beeaeb9f82ba
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

The usage of a static variable instead of a pointer guarantees it will be
constructed and destructed only once.

Change-Id: I7f587ec131b43fe5685122e9a384f1871dcdf790
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Hiding a category in the timeline view is highly confusing. Previously
the "Painting" category would only be visible if either the model is
empty or at least one painting event was available. Like this it's
always there. In the obscure case of a mixed Qt4/Qt5 application you can
get two "Painting" categories now.

Change-Id: I54db106ed868b7e5d46d0e0ac22b46c0df8be862
Reviewed-by: Kai Koehne <kai.koehne@digia.com>

Previously the animation paint events could overlap if the framerate
estimates were off by more than 1 event. Furthermore the duration could
be negative or 0, with a potential crash in the latter case. Also it's
a bad idea to change the server-provided framerate to suit our estimated
durations.

Change-Id: I14da0855d7248a6ef32509572caa439ebb2d430e
Reviewed-by: Kai Koehne <kai.koehne@digia.com>

Change-Id: I0423cf1b710c5522d494e95b2076f52c06e68ab0
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

- Use a QSharedPointer instead of an explicitly shared pointer.
- Remove the LiveUnitManager.

Change-Id: I05bf32c1f77c17f42ee1da39f1353cff580fa6eb
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>

Also when duplicating editors, we don't want to change the document
after construction. Actually at some places (e.g. CppEditorSupport
creation) we don't handle document changes correctly, and we are only
lucky that things still (more or less?) work. Get rid of
BaseTextEditorWidget::duplicateFrom and use copy-constructor style instead.

Change-Id: I7f688b7fcc51d1bb5e222bb333f0d28479b597a6
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>

Change-Id: Ie2145903f9ac303d88455cfd609f55240aa76a67
Reviewed-by: hjk <hjk121@nokiamail.com>

Change-Id: Ifa20cc17675dfce1da9b087ee2e9b2ecdb3d8f22
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

First step in never changing the text document after construction,
because that is actually not really supported.
Second step will be to fix that for the editor duplicate() methods too.

Change-Id: I3d112ba0895e7ee7ac6dd8ae2318f0de7d2cebc9
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>

Since we copy the java files to the build directory, we need to adjust
the path that the java compiler emits for error messages.

For that the JavaParser needs to know the source directory, which is
the android package source dir and the build directory. The
AndroidDeployQtStep thus needs more information then just the
input json file and now stores the path to the .pro file to both
retrieve the input file and the android package source directory.

Task-number: QTCREATORBUG-10904
Change-Id: Ib5141b35b610bc2eee568a096fc5e930f9eb2e47
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>

This patch also moves the showMargin and marginColumn settings into a
new settings class.

Change-Id: I676447be751c13ee438edc1e31e5998b999c6771
Reviewed-by: Eike Ziller <eike.ziller@digia.com>