GitLab

Replace PREFERED_PROJECT_NODE with PREFERRED_PROJECT_NODE.

This changes public API. The constant text does not seem to be stored
on disk anywhere, though ...

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

Conflicts:
	qbs/imports/QtcTool.qbs
	src/plugins/git/giteditor.cpp
	src/plugins/qmldesigner/qmldesignerplugin.cpp

Change-Id: Icafd32f713effb1479480a0d1f61a01e429fbec0

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

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

All the calls pass a single argument

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

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

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

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

So that the resource node can override it.

Task-number: QTCREATORBUG-11678
Change-Id: Id30d1b99ee23cc18fc29fc99cf0ad7ca919ed527
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

The code was introducted before the "default configuration"
was implemented.

If the user deactivates all the BlackBerry Api levels, and restarts
Qt Creator, BlackBerry kits will get generated again, unless all
the API levels are completely uninstalled.

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

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

Handle CR in the output of the VCS we are running in the checkout
wizards. This makes sure we get proper progress information when
running the checkout operation.

Note that this is not a perfect implementation: It will fail when
e.g. only a number at the start of the line is updated and the
rest of the text in the line is reused.

Task-number: QTCREATORBUG-10112
Change-Id: If742e5cb945a2fcada8319d08610d1ccc7fa2ae8
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

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

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

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

This is only a workaround, for older versions of Qt. The real bug is
that a non-integer y offset is interpreted inconsistently by QtQuick.

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

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

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

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

Task-number: QTCREATORBUG-6612
Change-Id: Ic56f4cd20063c9d4d05316607636aa3df1d1a5a3
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

At least for the Side-By-Side Diff for now.

Task-number: QTCREATORBUG-11115

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

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

Task-number: QTCREATORBUG-11115

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

Task-number: QTCREATORBUG-11115

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

Task-number: QTCREATORBUG-11701
Change-Id: Iee87deec59a8abed8930096c53e3c3514a208486
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

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

Task-number: QTCREATORBUG-10485

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

The flags used by the project explorer to interrogate the toolchain for
compiler-defined #defines always indicate a C++ file. So, this will
always include a #define for __cplusplus. When editing C code with
the clang code model, this results in extern "C" linkage specifications,
which result in warnings or errors.

The proper fix is described in QTCREATORBUG-11709, but is too big to be
done within the 3.1 timeframe.

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

Especially for mixed debugging getting the ID explicitly
gives hints which part of the combined engine fails.

Change-Id: Iab4b54d6e9fb8d4afd3df0855861511bc06454c1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

Change-Id: Ide277128d30c4dcc5c396441ebd6e40aa3fc8b51
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

Avoid that QDir::home() is potentially called twice.

Change-Id: I9fca53f800be74f05d941cf9baa34eecb6c899cb
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: David Schulz <david.schulz@digia.com>

Change-Id: I1184b15a8b225430b59e0abb35cd9395cb7d1850
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

The button actually reads "Do Not Show Again".

Change-Id: I9e8599d26f1fe4ce73af739833dcec1ed8cc9a07
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

If there is no enum value fall back to the instanced value.

Change-Id: Idd4654d6e9fb8d4afd3df0855861511bc06454c1
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>

The control has to use the new enum api.

Change-Id: I73e86ac1c4f2c3fe4373b12968ac86fbbaee64aa
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>

They have to use the new enum api.

Change-Id: Ib4ac7d56512007cb19fd7e6a65413198a9d90719
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>

In order to use the correct mkspec in the qmake step,
the qt version mkspec needs to be explicitly listed in the QnxToolChain
suggested mkspec list (Otherwise the first one found in
list will be used).

That is currently broken due to the following issues:

* The mkspec for BB armle-v7 target has been recently
changed to blackberry-armle-v7-qcc, which was not listed
in the QnxToolChain suggested mkspec list.

* The Qt4 for BB armle-v7 uses the "default" mkspec which is a copy
of the "blackberry-armv7le-qcc" mkspec. The mkspec
name should be explicit in order to be found and used.

Task-number: QTCREATORBUG-11674

Change-Id: Idb53d22e7c4b746b23dd3a65c42d00dca5c27d0c
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>

Looking at the screenshots, fails might be timing issues.

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

Since Qt Creator 3.1 will be released before Qt 5.3,
bumping the version number and enforcing to rebuild the puppet
creates a huge hurdle for end users.

Change-Id: Ic85a2ed315cf67b7d47bdfa492e6c5d2adf719d9
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>

Older puppets crashes if we send enumerations so we convert them before.
This patch has to be reverted in master.

Change-Id: Id33e776616ea6e74c7b14799e3aed130c39f8fed
Hotfix: 3.1
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>