GitLab

Conflicts:
	qtcreator.qbp
	src/plugins/qtsupport/baseqtversion.cpp
	src/tools/tools.pro

Change-Id: I43c391328ae747b3dc566f9db2384fedc1a6d0a5

Simplify the .pro-file while at it and add rpath.

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

Task-number: QTCREATORBUG-7922

Needed to work around
Task-number: QTBUG-13496

Done-with: Joerg Bornemann <joerg.bornemann@digia.com>

Change-Id: I7d5f7cc4cd45909ed4e3b5a16fd235820bc3ef8c
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>

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

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

List supported types of animated images.

Change-Id: Iae12c805db9bc69da97b842e79f1aa18a3d6ff5d
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>

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

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

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

When importing existing builds we end up with kits that are not
defined by the user yet. These kits are destroyed if the user does
not import those builds after all.

This patch marks these kits as temporary till they are accepted and
become permanent.

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

List any detected build in all kits that match the characteristics
of the project build settings found when importing a build for
unconfigured projects.

So far we just listed it with the first kit we found which is
surprising sometimes (e.g. when having a embedded linux and a desktop
kit using the same Qt version).

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

QMake is of version 3.0 in Qt5 and we failed to get the Qt version
from its output due to this.

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

If Webkit is disabled, moc will run on the file anyway, because there is
a ".moc" included and moc does not know about #ifdefs. This results in
an ugly warning ("no output generated") being emitted in the no-Webkit
case.
Solve the problem by moving the declaration of the QObject subclass into
the header file.

Change-Id: I2abaffd85a342fa2f3dbaa7bcf3ef63a2972c73e
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>

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

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

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

Removing dependency on <private/qdeclarativemetatype_p.h>
in property editor.

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

PropertyParser takes care of the issue now.

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

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

This class is not used anymore.

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

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

Lets see, which value will not work.

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

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

We have to also check for the correct QtQuick 2.0 in a few places.
For Positioner I added a helper function.

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

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

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

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

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

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

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

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

Kit names are unique already, no need to try and make them more
unique:-)

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

Avoid having a default kit without any Qt version set if we have
one that could be used for the desktop.

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

Task-number: QTCREATORBUG-7904

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

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

Attaching a second RewriterView is not allowed.

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

We have to process events to ensure that the correct
data is actually delivered by qmlpuppet.

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

Image does not exist have a revision 1.1.

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

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

Task-number: QTCREATORBUG-7919

Change-Id: I12307c3fb6c20424c8b5aaf564a031924c755d25
Reviewed-by: hjk <qthjk@ovi.com>