Change-Id: Ia0f3abad74b7ac423fab621ca22e0f698747c477
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: Ray Donnelly <mingw.android@gmail.com>

Change-Id: I4964e5bf22a715375a7fa080604d16692c956fc2
Reviewed-by: BogDan Vatra <bogdan@kde.org>

Task-number: QTBUG-31147

Change-Id: Ifdeef2fa96668fdb482fd613eb8766c1ff5e3afd
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

Having a semi-colon at the end of line results in a parse error when
processed with qmake.

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

fixes Ib2ea66bd5694046577a0b5a0e2f611f3ffba0238

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

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

Done-with: Liang Qi <liang.qi@digia.com>
Change-Id: I5bfe56344497b950951bc5f038ce6868abb2f41a
Reviewed-by: Liang Qi <liang.qi@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

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

When looking for lines in Java files that are not supported by the
selected API level, it didn't take into account that line endings are
"\r\n" on Windows. toInt() was failing, trying to convert for example
"10\r" to an integer.

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

Since the file path starts with file:///

 use QUrl to
get local file name.

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

Task-number: QTCREATORBUG-9391

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

This will keep the setting from vanishing after the first time
creator is run.

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

Make sure to not change the environmentId when editing something
in the settings page.

Task-number: QTCREATORBUG-9359
Change-Id: I7fc891cb3a69f08b1c2ea3f963a2deb01ddca9b2
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

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

If the logs contain a '\n' the message parts in the new lines are not displayed.
The new line messages are displayed with no buffer details and are ignored
when the parsing is processed.

Cherry-picked: a7fa0dd4

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

Referring to non-existing files causes an error now.

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

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

getBundleInformation must be called synchronously

Change-Id: Iebe00295e1ef0679fdd6f9b849672d72f5ea998a
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

These cause a warning now.

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

Task-number: QTBUG-31012
Change-Id: Ic19cc79faaa71a09724445cf961ec16cf16fcbb4
(cherry picked from commit 4dd4bff8)
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>

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

This fixes a regression when starting debugging from the command line
using 'qtcreator -debug /some/binary,server="localhost:1234"'. The
parameters have been parsed correctly, but were later overwritten
by data from the default (desktop) "device".

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

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

Quick fix. Do not merge into 2.8 or master

Task-number: QTCREATORBUG-9342

Change-Id: Ic63d5d858321e381caf9ede7615075e4923a7b35
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>

Do not show warnings if recovering from an error.

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

This fixes a bunch of warning when building with the updated qbs
version.

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

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

ResolveExpression has to have a reference of ContextLookup. If not there
will be a crash because of deleted instanitated base template class.

Task-number: QTCREATORBUG-9329
Change-Id: I7f8c83da0d81ac6311e76d15a897adbc70b08d75
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>

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

Plus some minor adjustments in the qbs project manager to an API change.

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

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

Was accidentally disabled in 066efcd6.

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

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

To solve the problem with libQt5MultimediaQuick_p we need a way to detect
if an application is using both QtMultimedia and QtQuick.
This change adds logic to parse the -dependencies.xml file and look for
lib elements that have the extra attribute "extends". Libs with the
extends attribute will only be added to the list of dependencies, if the
library it extends is available.

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

Task-number: QTCREATORBUG-9298
Change-Id: I8660e7d9614e77d23e1ef6515904941505f410dd
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Marco Bubke <marco.bubke@digia.com>

Change-Id: I4ab239307f0c164f27fdb5e1234a9bb55c8ef7ca
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Sergey Shambir <sergey.shambir.auto@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

Fixes a bug in conjunction with ApplicationWindow.
Anchors did not update properly.

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

Task-number: QTCREATORBUG-9297

Change-Id: I06345bd53fe5672ce7606745e6b19f89379a18db
Reviewed-by: Ray Donnelly <mingw.android@gmail.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>

The sdk should set that extra directory, via the sdktool.

E. g. something like
sdktool addKeys android MakeExtraSearchDirectory QString:%DIRECTORY%

where %DIRECTORY% is the bin directory of the bundled mingw.
That is Tools\MinGW\bin for the qt sdk.

Also see:
Task-number: QTCREATORBUG-9297

Change-Id: I487c67b7fb704dd00cf5c6f4f647c8c4fbe8cd3d
Reviewed-by: Ray Donnelly <mingw.android@gmail.com>
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>

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