Tim Jenssen 1df6443d4a Merge remote-tracking branch 'origin/4.10' ...

Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/libs/utils/synchronousprocess.cpp
	src/plugins/baremetal/iarewtoolchain.cpp
	src/plugins/cmakeprojectmanager/cmakeproject.cpp
	tests/unit/unittest/CMakeLists.txt

Change-Id: I124ad492df403286751e175d27fe36487ddf6d07

2019-07-04 15:17:55 +02:00

..

fileformat

Merge remote-tracking branch 'origin/4.10'

2019-07-04 15:17:55 +02:00

images

QmlProjectManager: Re-use folder "qml" icon overly from ProjectExplorer

2017-12-14 14:44:17 +00:00

CMakeLists.txt

Qt Creator CMake port

2019-05-17 13:33:28 +00:00

qmlproject.cpp

Merge remote-tracking branch 'origin/4.10'

2019-07-04 15:17:55 +02:00

qmlproject.h

Enable macro editing for the Clang indexer

2019-06-13 16:51:48 +00:00

qmlproject.qrc

QmlProjectManager: Re-use folder "qml" icon overly from ProjectExplorer

2017-12-14 14:44:17 +00:00

qmlprojectconstants.h

QmlProject: Implement basic support for QmlFileSelector

2019-04-25 13:55:29 +00:00

qmlprojectmanager_dependencies.pri

qmljs: move defaultProjectInfoForProject to the qmljs library

2014-07-24 16:54:42 +02:00

qmlprojectmanager_global.h

Wholesale conversion to #pragma once

2016-03-30 15:20:19 +00:00

QmlProjectManager.json.in

Fix copyright year in plugin info, --version, and macOS info

2017-08-24 11:23:40 +00:00

qmlprojectmanager.pro

ProjectExplorer: De-virtualize EnvironmentAspect::baseEnvironment

2019-03-07 16:06:46 +00:00

qmlprojectmanager.qbs

ProjectExplorer: De-virtualize EnvironmentAspect::baseEnvironment

2019-03-07 16:06:46 +00:00

qmlprojectmanagerconstants.h

Pass id to RunConfiguration constructor

2018-04-25 15:06:11 +00:00

qmlprojectnodes.cpp

ProjectExplorer: Flip default for ProjectNode::showInSimpleTree

2019-03-01 08:57:05 +00:00

qmlprojectnodes.h

ProjectExplorer: Flip default for ProjectNode::showInSimpleTree

2019-03-01 08:57:05 +00:00

qmlprojectplugin.cpp

ProjectExplorer: Switch order of template parameters

2019-04-02 09:46:48 +00:00

qmlprojectplugin.h

ProjectExplorer: Introduce a SimpleRunWorkerFactory template

2019-03-19 15:56:17 +00:00

qmlprojectrunconfiguration.cpp

ProjectExplorer: Replace RunConfiguration::executable

2019-06-12 12:30:23 +00:00

qmlprojectrunconfiguration.h

ProjectExplorer: Add executable() accessor to RunConfiguration

2019-05-24 09:12:42 +00:00