delta/qt-creator.git - code.qt.io: qt-creator/qt-creator.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Core: Add FilePath based overloads to EditorManager::openEditor{,at}	hjk	2021-05-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \|	Part of the overall FilePath migration. Keep the original version for a while to allow using code to catch up. Change-Id: Ia7c5ea14416a06e679e8661c0e4045981db87b9b Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: David Schulz <david.schulz@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
*	Merge remote-tracking branch 'origin/4.13' into master	Eike Ziller	2020-08-31	1	-1/+3
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri src/plugins/clangtools/virtualfilesystemoverlay.h src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildstepconfigwidget.ui src/plugins/qmldesigner/designercore/model/abstractview.cpp Change-Id: I5013bd8fdd28d79cdea74380bec01d4c106adfaf
\| *	QmlDesigner: More compile with namespaced Qt	hjk	2020-08-31	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Amends 4886375994. Compiles for me without. Change-Id: Iaccbe6a2000d1b87008496f0e515a94aa7955061 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
\| *	Fix qmake build of unittests	Christian Stenger	2020-08-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This basically continues / amends work done with e1c88116b3. Change-Id: Ia8b3a4694e7fea4c15e344839f87c11fbe8fbbf4 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* \|	QmlDesigner: Fix various compiler warnings	Christian Kandeler	2020-08-07	1	-1/+1
\|/ \| \| \| \| \| \| \| \| \|	-Wdangling-else -Wdeprecated-declaration -Wunused-function -Wunused-parameter Change-Id: Id655b6c9c043e2049e921b05619f596b3641bdbd Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
*	AssetExport: Add generated UUID to qml	Vikas Pachdha	2020-06-26	1	-1/+10
\| \| \| \| \| \| \| \|	This will enable the merge when importing back from Photoshop Task-number: QDS-1555 Change-Id: I411ad65af1a33a80fcea80206aef93e2d1afa357 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
*	AssetExport: Delay the load signal from view	Vikas Pachdha	2020-06-19	1	-1/+4
\| \| \| \| \| \| \|	Aparantly the QML file is not completely loaded when model is attached Change-Id: If8c342c057a1cd33b6f7510bbf9f56a1f3369961 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
*	AssetExporter: Add basic infrastructure for the plugin	Vikas Pachdha	2020-06-12	1	-0/+149
	Adds export action, basic UI and workflow classes Change-Id: If019a8fa48cacaf7e7665335c53b3adeeb257b07 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>