GitLab

Change-Id: I71a1063a1de3e4bb445bf9f8faa5553da3b5c4ab
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
(cherry picked from commit 54da4378

)
Reviewed-by: Marco Bubke <marco.bubke@digia.com>

Change-Id: I86db7e9871d2332e1bff4eab3ce81182b55a0775
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
(cherry picked from commit 0bbd6f6d)

Change-Id: Id2ac1ab6e1c9693f2168bc0adf54bb7d67ce02ce
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
(cherry picked from commit ac438afc)

Change-Id: I1e834c69d06b9f739e696d5ae9c9071f8ada7fe9
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
(cherry picked from commit fb28c145

)
Reviewed-by: Marco Bubke <marco.bubke@digia.com>

Change-Id: I43ed62a10840723676884bf40722315d4dee8d80
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
(cherry picked from commit d904557f)

We use now widgetInfo() instead.

Change-Id: Icaea8f012b380368b6479fa81d370236ea5a6781
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
(cherry picked from commit 54431a09)

This view improves debugging of the Qt Quick Designer.

Change-Id: I01a0240fd304c48707021d4445b2c09c9243d868
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
(cherry picked from commit 15f58b16

)
Reviewed-by: Marco Bubke <marco.bubke@digia.com>

Atm QmlDesignerPlugin is the hook to get access to the ViewManger.

Change-Id: I97bc4bc6a079c586ba7ec54d1ca01c261f1d0e1d
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
(cherry picked from commit cabe2dd2)

Change-Id: I92e66ab9800c6f51c1cc0d4ed3a6947d1535218d
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
(cherry picked from commit 5ec627bd)

Change-Id: I80df84f0dd9837282d059341c7cc08d56b18095a
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
(cherry picked from commit ac5473cb)

Also show the value.

Change-Id: I74cc4b353a795ad00e80b714e85c222ee3753a75
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
(cherry picked from commit 3efcf6b4)

Change-Id: I9adb43b9c9f2b2c97693ebb09ebef795d0206d1c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
(cherry picked from commit fdfb3caf

)
Reviewed-by: Marco Bubke <marco.bubke@digia.com>

Change-Id: I0667340c83b8c8ec5ffc965fe239c9a5b7891c9f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
(cherry picked from commit 28413a81

)
Reviewed-by: Marco Bubke <marco.bubke@digia.com>

Change-Id: I9f421b471c3211420a059181e23977fca237d7c5
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
(cherry picked from commit 45ccbf41)

This is just for Qt Creator 2.7 to reduce merge conflics.

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

Change-Id: I48aff6a1a94ca3c0bcd8b0689333b6acad7d35cd
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
(cherry picked from commit 81341a86

)
Reviewed-by: Marco Bubke <marco.bubke@digia.com>

Change-Id: I91b8bee6e714612d01092325c70d8bb69746a9ac
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
(cherry picked from commit 4c9d2e53)

Change-Id: Iae3d4b5db84c4a5f59ff8b4b1208b02b895df00f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
(cherry picked from commit ba69c69a

)
Reviewed-by: Marco Bubke <marco.bubke@digia.com>

Change-Id: I4075e62cb15c91be3561ac29df814d0f0f255b8e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
(cherry picked from commit b2a39399

)
Reviewed-by: Marco Bubke <marco.bubke@digia.com>

And PropertyName is a typedef for QByteArray. Because we don't use the
features of QString and the source would be cluttered with QLatin1Strings
we changed the property name to QByteArray.

Change-Id: Ib70ef136bbc411504b450456bd9bb705ae93dd25
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
(cherry picked from commit ee4bf638

)
Reviewed-by: Marco Bubke <marco.bubke@digia.com>

Change-Id: If7703c55217d89deefe0356d3032cc19e3fbd9de
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
(cherry picked from commit e84647ae

)
Reviewed-by: Marco Bubke <marco.bubke@digia.com>

There is a hot fix, which is using a timer. This patch is using the
improved approach of testing if a document exists in the new project.

Change-Id: I16ac049c2cc4c0a21ab82fc854c8a062df037f55
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
(cherry picked from commit e263417b

)
Reviewed-by: Marco Bubke <marco.bubke@digia.com>

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

Task-number: QTCREATORBUG-9014
Change-Id: Ib155b09f5c57101cbacce1c2e9981a7d5b6be731
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Check if there is any qtVersion->qtAbis() before getting the first element.

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

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

Do not change the debugger when autodetecting it if the current
one is ok already.

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

Task-number: QTCREATORBUG-8974

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

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

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>