Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/cpptools/cppcompletion_test.cpp

Change-Id: Ic5e75b3ef164de664a1449ffa8579beaf5b02521

For those functions that don't need the filename.

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

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

The Android app tutorial is now a more generic mobile app tutorial, so
it was moved to qtquick folder and renamed as creator-mobile-app-tutorial.qdoc.
The page name (HTML) was also changed accordingly.

Change-Id: I749f45a611b32204e5551884238f79d3d3b639fa
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
(cherry picked from commit 3e0ffdcb)
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

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

Task-number: QTCREATORBUG-11992

Change-Id: Icb884847633bd421e3dc7bc034d598ef84d33422
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>

Exceptions are likely to be triggered from QML code.
Calling QMessageBox::warning() results in a call to exec() and
exec() returns back into the Qt event loop.

This is dangerous, because QML might have scheduled a deleteLater
which is then executed by exec(). This can crash the application, because
the object is supposed to be "deleted later" and not directly
as a side effect of the signal that was emmited by QML.

Task-number: QTCREATORBUG-11946

Change-Id: Icb884847633bd421d3dc7bc034d598ef84d39429
Reviewed-by: Marco Bubke <marco.bubke@digia.com>

The JavaScript events are integrated into the Timeline and Events
views for apps that use the V4 engine and are built with Qt 5.3.
Updated the Events view screenshot and removed the JavaScript
view screenshot.

Change-Id: Id7e74d91343ff049df580d487e729fdb20c57b0e
Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>

The Info.plist was generated for putting the Qt Creator version into it.
Since that is not very useful nor necessary information, we can just
avoid the whole generation, and make the logic much simpler.

Change-Id: I71a12dc7e53970e3ef136e8abc78077dfba3326e
Reviewed-by: Marco Bubke <marco.bubke@digia.com>

Keep the value instead in the map.

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

Introduce a original version to indicate which version the map was
upgraded from.

THIS CHANGE REMOVES SUPPORT FOR .USER FILES WITHOUT VERSION INFORMATION!

Those files were written before Qt Creator version 1.3.

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

Cut-and-past-o in a currently unused code path.

Change-Id: I2c690e5010ade7f3ebbb4a94163d7b44da13c10d
Reviewed-by: Christian Stenger <christian.stenger@digia.com>

We don't need to connect to the clicked signal, since we are already
connected to the current changed of the selection model. Also set the
model for the templates view in the constructor, so that we can also
connect to the selection model in the constructor.

Change-Id: I88cd1bef97136604125fc74e18ffcc5c1c118a1d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>

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

Task-number: QTCREATORBUG-11983

Change-Id: Id70bd18b1b5494db19adb9928277356c4d4a4688
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

This was recently introduced in qtbase/9ce697f2d54be6d94381c72af28dda79cbc027d4

Change-Id: Ied71c5d6a3571342153737ccb62de1424931fd51
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

m_useNinja is now only used to store the value at init() time, thus
it's only use is to know while running, whether ninja is in use.

Otherwise whether ninja is used or not, is stored in the
buildconfiguration.

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

Technically the user can only get into a no buildconfiguration state
with broken settings. But we should either check everywhere or nowhere.

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

The #define COMMA trick doesn't work anymore after the
latest Q_DECLARE_METATYPE changes.

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

Temporarily set the ErrorMode so that no Windows error message box will
show up in case qmake fails to run (e.g. because of missing .dll's).
The error mode will automatically be inherited by child processes.

This fixes an issue that actually became virulent by another bug fix
( cbb05306 ).

Task-number: QTCREATORBUG-11962
Change-Id: I5baccf52baee46f3d45b69ea0a13d77e4e113fbd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

* Remove qualification for types in Gerrit::Internal
* Remove action/command pair. Action is stored in Command.

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

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

Convert Q_PID to int using utility function.

Change-Id: Iab18b1b4044e323e14e63f9159a82ad5040117ce
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>

Change-Id: I1c690e5010ade7f3ebbb4a94163d7b44da13c10d
Reviewed-by: Christian Stenger <christian.stenger@digia.com>

...where applicable.

Change-Id: Ie42e1012598adf124e5f66b6a53eda01724dfb71
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

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

Do check for toolchains not defined in the toolchains.xml file again,
but also allow for toolchain IDs to be ABIs.

This partially reverts a commit from Kai made earlier.

Change-Id: Idad004f0bff655bc136bc43de5837d61a045e311
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Task-number: QTCREATORBUG-11952
Change-Id: I1ef4b5ec7dfcf56cb7c07882b8e091fd84b26121
Reviewed-by: Christian Stenger <christian.stenger@digia.com>

A very simple non-intrusive plugin. Adds a bunch of actions typical emacs user
would expect. Doesn't contain any default key bindings.

Change-Id: Ib30fb46c577e2fdfd4c704e7f4eee7ee27a53c29
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Change-Id: I0c690e5010ade7f3ebbb4a94163d7b44da13c10d

Previously Enter Find String (Ctrl+E) required opening Find toolbar at least
once, which is minor but noticeable annoyance.

With this change it always opens Find without focus, so it lines up with Find
Next Selected behavior and also with default Mac behavior. It does also show
yellow highlight for all occurrences without moving cursor.

Task-number: QTCREATORBUG-8993
Change-Id: I1eb8f151d5482895cc49fa5281e7d4e66cf31545
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

QTCREATORBUG-11548 has a quick fix now.

Change-Id: Ia9f38f58bf5d11d5ece4779fd7527fbf8ae65fb1
Reviewed-by: Robert Loehning <robert.loehning@digia.com>

The parent of instantiation of nested class of template class
should be the instantiation of enclosing template class.

Task-number: QTCREATORBUG-11752
Change-Id: I8875c738848b85731f5ea88a60da190b4b0ad18f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Fix a case:
struct A
{
  int a;
};

typedef A B;
typedef B* Bptr;
Bptr b;
b->

Task-number: QTCREATORBUG-10021
Change-Id: Ibf5ca801dbdb72744416924c0b8fc03daad5948a
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>

There are currently ~40 actions. Reserve some extra for future use.

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

It does nothing in this case anyway

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

Task-number: QTCREATORBUG-11859
Task-number: QTCREATORBUG-11860
Change-Id: I7484b3b88daefbb3c76bb86a9b573e8291072872
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
(cherry picked from commit 5416557a)
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

* Remove repository setting
* Disable Gerrit menu entry if there is no top level

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

It's confusing. The user can just choose the path in the dialog rather
than in a popup

Change-Id: I91422ec9baf5508d3e3d2e552afc6b955fd84748
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

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