Qnx: Fix warning

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>
Fix alignment issue on Mac OSX with PathChooser.

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>
Android: Fix use_local_libs when running from launcher

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>
fix qbs files for MacOS

Change-Id: I73dc7f853eb250ae155386674d8cb9aa1d3c1678
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Fix taborder in debugger dialogs

Task-number: QTCREATORBUG-8946
Change-Id: Ib09f5e3238e27ed8712da12a1f18b051aef82669
Reviewed-by: hjk <hjk121@nokiamail.com>
Squish: Let tst_create_proj_wizard test for Madde too

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>
Squish: Fix for tst_installed_languages

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

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

Change-Id: Iae22c2185fb0bde2509a0f6a9a975be4e7c2077c
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
debugger: Avoid failing assert in theId()

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

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>
[QNX] Fix qmake environment resolving

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>
Support deployment to android-no-sdk platform

Change-Id: Ia7dad81e4998e04cbcda51de420ca677f56aa63f
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Squish: Fix using context submenu items for Mac

Change-Id: I9ab351777f0bae7d15173d0c6cf5eb2f7f719810
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Squish: Fix tst_HELP06 on Mac

Change-Id: Iaea464d2f76c06566b0c9eeb9bc4572e2e90facc
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
CMake: Fix parsing of C++ defines

Partially revert 20cfccd7533fb68cc9759c015a2b6573d167581c 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>
Squish: Fix tst_create_proj_wizard on Mac

Change-Id: I0f69e7d34ee4fb1dec2f30e916ff29a33fb5111a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Git: Support SQUASH_MSG for commit message

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>
CMake: Correct encoding of defines

Change-Id: I8c5049ce52d20137dc4233c09ab68aaa07df7fe7
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Squish: Warn about handling two different signals

Change-Id: I6877b0d6d0a1e5e1961e9c8fc054ac096c34c6cb
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
ClearCase: Fixed soft assert when currentState has no file

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>