...when running on build machine and VNC session has been started
by Jenkins. If so, the DISPLAY variable must be set automatically
and we should not override it.

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

A property set on the product level is ignored if the same property
is also set in a Properties block whose condition matches.

Change-Id: I9248d735977e3d8ff8f1836fd80a49f3c8839bdc
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

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

Change-Id: I82ffa76bcb5850e8bda11d1daca3430e04e9695a
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com>

Sometimes one would get an error "hdiutil: resize request is above
maximum size allowed." which might have to do with autostretch limits.
Passing the -stretch argument with a sufficiently large size should
make resizing succeed.

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

Check if the user settings file exists before trying to restore
kits.

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

This fixes an alignment issue on the BlackBerry device configuration widget

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

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

Also the HTML code is now valid XHTML.

The latest draft of HTML 5 still suggest <br> btw.

http://www.w3.org/html/wg/drafts/html/master/


text-level-semantics.html#the-br-element

Change-Id: I436ddecd1565cb319de4385973322d7413dd8471
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>

Change-Id: Ic592b588d257f369738ff2f90480091576bfa7a8
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

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

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

We used to store those paths as they were writen in the registry with
'\'. That was changed in edb13dd3

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

The watch data model is cleared on every debug step. Hence,
tracking of expanded watch data is lost. Now, we keep track
of expanded watch data when stepping. However, we still lose
track of this data on a scope/stack change.

Task-number: QTCREATORBUG-8901
Change-Id: I1dc609cae1c3a36d8320864f71336b655eaa09d1
Reviewed-by: Kai Koehne <kai.koehne@digia.com>

Loaded debuggers from a generated profiles.xml
where overwritten by autodetected values. So
check if debugger is valid before taking
autodetected values.

Change-Id: I768821950cc507c8b772ea1894af6b653e7604d1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Task-number: QTCREATORBUG-8886

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

Task-number: QTCREATORBUG-8910
Change-Id: I11362d94aa271c9e5e6d97637993b6dab6713117
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>

We want the qbs library and resources to be placed in
the canonical places when installing Qt Creator. This
also makes it necessary to change the location of the
respective files in the build directory.

Change-Id: I8e78ec5aa0e8b728ccca96d45a647c1488961ea0
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

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

We use the same name unification method as everywhere else, so adapt
the unit test accordingly.

Change-Id: I71090f26dd33901b89d8bb6ac2bccda811a63515
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

Fix some remaining occurences and screenshots.

Change-Id: Ibb8d874996fe767aca180b2964559313efa8157e
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>

The debug button should be enabled or disabled after
checking if the project can be run in DebugMode.

Change-Id: I2700c1de290f89bae9456319c2e93857374838ed
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Some code was there but the ui file and the showing code was missing.

Change-Id: I9a865ff7a10995d3b129e0b18c2f250bca852f9e
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>

Change-Id: I3cc3e1f20fdd122f9f493c25d15902e926fe0ad9
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

Since Squish 4.2.3 the signal handling has been fixed and this
signal won't be caught by Squish because it was triggered by another
object.

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

The unload of qmljs plugin caused qmljs code style settings
to be deleted, while core still had a pointer to them and
used it afterwards. Added unregisterCodeStyle* methods
for symmetry and used them on plugin destruction.

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

we don't support building 3rd party plugins against an installed qt
creator anyway (we don't install any headers), so it makes no sense to
install import libraries (especially into the wrong directory).

Task-number: QTCREATORBUG-8395
Change-Id: Ie6703598324d9dd39aa82d1eb0f2fecd224e4390
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

In Qt Quick 2 the parent property is writable.
Therefore the InstanceSpy always collected the complete
object tree waisting memory.

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

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

Editing a file inside .git directory is intentionally not detected as
managed by Git. This causes cache override for the real toplevel with
a null version control

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

Use the right makefile.

Task-number: QTCREATORBUG-8793

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

Make sure to not save in the KitManager destructor: Depending on how
creator is shut down (e.g. auto-shutdown after running plugin tests)
the other Managers may already be gone and then the Kit data will be
damaged.

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

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

Task-number: QTCREATORBUG-8839

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

Requires BUILD_TESTS qmake variable to be set

Change-Id: Ida266ce96ec4725608e1290908c546b32ba681ac
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

They were either opened as text/plain, or, if they were empty, as
application/vnd.rim.qnx.bar_descriptor types.
This hotfix makes the mime database consider lower levels for matching
by extension, if no match with maxweight was found, and reduces the
weight of the application/xml type's ".xml" extension, so the
bar_descriptor type can override this based on its content matcher.

We should do a real fix in post-2.7.

Task-number: QTCREATORBUG-8920
Change-Id: I3d6f4455ba23485d0229967eaa3eea6abe19746f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>

Change-Id: Ib031eb791f0a089376d02cc75a62fcc7d1f859cb
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>

Now everything following '///' or '//!' is a doxygen comment.

This simplification fixes also the bug ('\n' was considered as part of
the doxygen comment and led to strange highlighting).

Task-number: QTCREATORBUG-8921

Change-Id: I6dae3b80ec11400f2f623897257782a80860a7f3
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>

ResolveExpression used the wrong Control object, which was deleted by
~LookupContext() in TypeOfExpression::operator()). ~Control() led to the
dangling pointer.

Task-number: QTCREATORBUG-8890
Done-with: Erik Verbruggen <erik.verbruggen@digia.com>

Change-Id: Ic07947ee54087446b730e4d3ec4bef29defa4495
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>

Gracefully contributed by the Qt team @ Developpez.com

Authors:
    Alexandre Laurent <lw.demoscene@googlemail.com>
    Thibaut Cuvelier <dourouc05@gmail.com>
    Guillaume Belz <guillaume.belz@free.fr>

Change-Id: Id1db663fd2cdf820bba62f4b490755731d786a49
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Reviewed-by: Thibaut Cuvelier <dourouc05@gmail.com>
Reviewed-by: Alexandre Laurent <lw.demoscene@googlemail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>