GitLab

Conflicts:
	qtcreator.pri
	qtcreator.qbs
	share/qtcreator/qml/qmlpuppet/interfaces/interfaces.pri
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancesignalspy.cpp
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
	share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.h
	src/plugins/debugger/debuggerplugin.cpp
	src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.cpp
	src/plugins/qmldesigner/components/debugview/debugview.cpp
	src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp
	src/plugins/qmldesigner/components/formeditor/abstractcustomtool.h
	src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
	src/plugins/qmldesigner/components/integration/stackedutilitypanelcontroller.h
	src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp
	src/plugins/qmldesigner/components/navigator/navigatorview.cpp
	src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
	src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
	src/plugins/qmldesigner/designercore/include/abstractview.h
	src/plugins/qmldesigner/designercore/include/qmldesignercorelib_global.h
	src/plugins/qmldesigner/designercore/include/rewriterview.h
	src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp
	src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
	src/plugins/qmldesigner/designercore/model/abstractview.cpp
	src/plugins/qmldesigner/designmodewidget.cpp

Change-Id: I9d8126e88397c02a87b5e4ab4da44e2bc7089134

Task-number: QTCREATORBUG-8966

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

Task-number: QBS-238

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

This makes code sharing between the Qt SDK Qt Creator component
and the standalone one much easier.

Change-Id: I9573ef24054d88dcabfa89666703f6eada29140c
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

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

Change-Id: Iee594c1e615ef9ce3899f399aa0dad32240e5cac
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

Change-Id: Ic1eabaa0eab15c49dd3d8ce0e5ade02bd0aad739
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>

D:\dev\qt-creator\src\plugins\projectexplorer\toolchain.cpp:198:
warning: C4138: '*/' found outside of comment
D:\dev\qt-creator\src\plugins\pythoneditor\pythoneditorplugin.cpp:217:
warning: C4189: 'pCore' : local variable is initialized but not
referenced

Change-Id: I5e1447e98ac8cbff2c2b8981ddba7e08e7506e24
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

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

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

Change-Id: I1006f749007c91e93326852c619ddbf8447cfd7e
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>

Change-Id: I51af14fb64acdc5f6904189d394be890e40e1a45
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>

Change-Id: Ieb01ee7ecc1ae666e8ff86e92ef3616d71b79338
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

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

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

The project explorer calls from welcome plugin were only used by the
project explorer provided welcome page anyhow.

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

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

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

WidgetInfo contains now a factory for the toolbar buttons.
The ownership of the factory is taken by the SideBarItem.

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

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

These appear when compiling in release mode.

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

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

Change-Id: I0b1d0a0ed619d51932ac9a6f5415fb54efc723cc
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
(cherry picked from commit 0131bcdf

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

Change-Id: I2987b6a49b7adb34036a22876caed2f4c4012109
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
(cherry picked from commit 8d31cd48

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

Change-Id: I236c2e1422ef9a984d34b752e70e1dc8bcdee6a7
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
(cherry picked from commit 2d177eb7

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

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

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

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

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

Change-Id: I2d8dfe12378a47e012af16f8868eb48994620cbf
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
(cherry picked from commit 0d0c5057

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

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

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

Change-Id: Ie9c71e564e66874b0715ed35cfacc578ad8b58b0
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
(cherry picked from commit 27f261f0

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

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

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

Change-Id: I18ff1a1128a1929c6f8cace42a93d5499c0cebdf
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
(cherry picked from commit 058e593e

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

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

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

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

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

Change-Id: I6002d1daef782a2bb09061cf5906c82f39bd2439
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
(cherry picked from commit 37ec2c9c

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

Change-Id: Ibd2e30f97117ec2c20240e115e57f387fd220686
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
(cherry picked from commit 0edde8f8

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

Export FormEditorItem
Export FormEditorScene
Export FormEditorView

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

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

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

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)