Provide ability to omit files while copying the settings as well as
a given destination instead of always using a generated folder.

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

Seems to be more widespread.

Change-Id: I3fe161844b78970e321b4d91e18a411456dbeb9a
Reviewed-by: Sven Anderson <sven@anderson.de>
Reviewed-by: hjk <hjk121@nokiamail.com>

Unless the package path, or application descriptor path, are changed
actively by the user, those values will now be automatically generated
from the build directory and source directory respectively.

This fixes a problem where the path to the package would be in
the debug build directory, even though the build mode was switched
to release.

Task-number: QTCREATORBUG-8991
Change-Id: I78137fc8a6ba0532663808ac9800c03e8371e148
Reviewed-by: Mehdi Fekari <mfekari@rim.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: I4cd263b2f85ae4a342af68d156893bbaf9d2f90b

Change-Id: I874133d7200a2a2ea17f3fad0cc571b5b9376ac2
Reviewed-by: Sergey Shambir <sergey.shambir.auto@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

We need to set ANDROID_NDK_PLATFORM in the environment, but doing so is
not really possible on a per project basis. Make the hack in
AndroidQtVersion that sets ANDROID_NDK_PLATFORM safer by checking if the
current project's active target is indeed using a android kit.

Change-Id: Ifcdb07a19708ac6bac5f5a02caa1ff197c0e4d80
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

Ensure that we read before zeroing the pointer to the stubSocket
and not after.

Change-Id: If9d6f11916e644be96ed88db6a2595509f177233
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

Correctly returns true when the stubSocket is connected but the
process has already returned

Change-Id: Ie687e4109254cbe3a3a60e95bf182ce3b835e73a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

Make shortcut override handling not have side effects.

Task-number: QTBUG-30164
Change-Id: Ie54a31fc6539d4e509b0903983df0effa06cee12
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

With a split view open (:sp) closing the split
editor (:on) would crash.

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

The problem occurred when changing the XML source code
in the source editor, and not switching to any of the
widget views before saving.

Change-Id: I6831f54d8cb4b94dbc02aa3c305c2e9839f1c64c
Reviewed-by: Mehdi Fekari <mfekari@rim.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

The dialog text doesn't state that the changes will be
discarded. This is likely to be an unexpected behavior.

Will improve the dialog on master

This reverts commit cf41cd5e2a9b1927fd533789a30cfd80a4e0791e

Task-number: QTCREATORBUG-7031
Change-Id: I52eaf3cdef1b10b261ee9d2e9e14aa98e6e32bdd
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

The first time updateStatusActions was executed the currentState
had no file, then currentState().relativeCurrentFile() would
give an soft assert.

Change-Id: I4566ace3e538c9834a4a47857f4234a527c37641
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

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

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

Created for a squashed merge commit

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

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

Partially revert 20cfccd7

 that somehow
assumed that compiler flags would also include the defines.

See comment on
Task-number: QTCREATORBUG-3922

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

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

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

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

Use the updateEnvironment function instead of
checking manually the env.

Change-Id: I20cba82dab833359854d786ec6403c4bfe417243
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: Mehdi Fekari <mfekari@rim.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Contains fixes for the following two bugs uncovered when testing
Creator integration:
    - Qt4/Qt5 incompatibility regarding build graph serialization.
    - Refusal to load stored build graph because the project file
      is wrongly diagnosed to be different from the stored one.

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

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

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

This has been fixed now and is no more different on Mac.

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

The test will now execute as before, afterwards enable the Madde plugin
restart Qt Creator and perform the text again.

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

Task-number: QTCREATORBUG-8946
Change-Id: Ib09f5e3238e27ed8712da12a1f18b051aef82669
Reviewed-by: hjk <hjk121@nokiamail.com>

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

The old way of passing the use_local_libs settings to the
app (which is still supported for compatibility with Necessitas)
was to pass it as command line arguments when the app is
launched from Qt Creator. This will make the app depend on
Ministro if it's later launched from the Android launcher.
To avoid this, we pass the info as part of AndroidManifest.xml
instead.

Task-number: QTCREATORBUG-8643
Change-Id: Ib044ce8bf7e285cf46075a8713bd7fc6736052d5
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

Add buttons directly into the PathChooser instead of creating new QPushButton widgets.

Change-Id: I7b607c4c8cc7b27ec0d23d9849182437fc28aabc
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Mehdi Fekari <mfekari@rim.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

core unused. mimeDatabase() is static

Change-Id: I4f940cc16c5a3f00a20948f8fdf52af5a6ba0893
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

...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>