Eike Ziller 0448457fde Merge remote-tracking branch 'origin/4.6' ...

Conflicts:
	src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp

Change-Id: I4c619efd7c1060ffd759df44a03a111269d3478d

2018-01-24 13:42:40 +01:00

..

images

CMake: Add fileoverlay icons for cmake project files

2016-11-10 16:05:59 +00:00

builddirmanager.cpp

CMake: Enable switching between different temporary CMake configurations

2017-10-24 11:13:42 +00:00

builddirmanager.h

CMake: Fix tree scanner not getting run automatically

2017-11-21 10:19:53 +00:00

builddirparameters.cpp

CMake: Fix project parsing notification

2017-10-06 09:53:40 +00:00

builddirparameters.h

CMake: Enable switching between different temporary CMake configurations

2017-10-24 11:13:42 +00:00

builddirreader.cpp

CMake: Fix project parsing notification

2017-10-06 09:53:40 +00:00

builddirreader.h

CMake: Fix project parsing notification

2017-10-06 09:53:40 +00:00

cmake_global.h

CMake: Cleanup files

2016-02-12 10:37:13 +00:00

cmakeautocompleter.cpp

TextEditor: Make TabSettings accessible for AutoCompleters

2017-07-20 12:35:10 +00:00

cmakeautocompleter.h

TextEditor: Make TabSettings accessible for AutoCompleters

2017-07-20 12:35:10 +00:00

cmakebuildconfiguration.cpp

ProjectExplorer: Simplify BuildManager::buildList() calls

2018-01-11 10:49:56 +00:00

cmakebuildconfiguration.h

ProjectExplorer/all: Re-organize BuildSteps/{Deploy,Build}Config setup

2017-12-08 11:17:55 +00:00

cmakebuildinfo.h

CMake: Fix project parsing notification

2017-10-06 09:53:40 +00:00

cmakebuildsettingswidget.cpp

CMake: Block project configuration widget while project is parsing

2017-11-14 14:19:27 +00:00

cmakebuildsettingswidget.h

CMake: Fix "CMake settings have changed on disk"

2017-10-24 11:10:30 +00:00

cmakebuildstep.cpp

ProjectExplorer/all: Re-organize BuildSteps/{Deploy,Build}Config setup

2017-12-08 11:17:55 +00:00

cmakebuildstep.h

ProjectExplorer/all: Re-organize BuildSteps/{Deploy,Build}Config setup

2017-12-08 11:17:55 +00:00

cmakebuildtarget.cpp

CMake: Fix project parsing notification

2017-10-06 09:53:40 +00:00

cmakebuildtarget.h

CMake: Fix project parsing notification

2017-10-06 09:53:40 +00:00

cmakecbpparser.cpp

Convert macros from plain QByteArray to a vector of structs

2017-09-14 15:23:56 +00:00

cmakecbpparser.h

CMakeProjectManager: Clean forward declaration

2017-09-27 07:46:06 +00:00

cmakeconfigitem.cpp

CMake: Allow to unset configuration values

2017-10-17 08:21:07 +00:00

cmakeconfigitem.h

CMake: Allow to unset configuration values

2017-10-17 08:21:07 +00:00

cmakeeditor.cpp

Core: Return context help id by callback

2018-01-18 13:54:02 +00:00

cmakeeditor.h

Core: Return context help id by callback

2018-01-18 13:54:02 +00:00

cmakefilecompletionassist.cpp

Session: Move all functionality related to Nodes into ProjectTree

2017-12-12 13:44:09 +00:00

cmakefilecompletionassist.h

CMakeProjectManager: Clean forward declaration

2017-09-27 07:46:06 +00:00

cmakeindenter.cpp

Editor: Fix whitespace cleaning.

2016-02-24 12:03:12 +00:00

cmakeindenter.h

Editor: Fix whitespace cleaning.

2016-02-24 12:03:12 +00:00

cmakekitconfigwidget.cpp

Drop unused variables and lambda captures

2017-09-08 09:06:53 +00:00

cmakekitconfigwidget.h

CMake: forward-declare QDialog

2016-10-20 10:30:03 +00:00

cmakekitinformation.cpp

Move HTML out of translated strings

2018-01-24 10:18:28 +00:00

cmakekitinformation.h

CMake: Register a feature for CMake-capable kits

2017-04-04 13:27:30 +00:00

cmakelocatorfilter.cpp

Locator: Cleanup and modernize Locator and filters

2017-12-30 18:58:25 +00:00

cmakelocatorfilter.h

Remove 1-1 dependency between locator and locator input widget

2017-06-13 12:42:13 +00:00

cmakeparser.cpp

CMake: Improve parsing of "CMake Error at" messages

2017-06-21 08:06:08 +00:00

cmakeparser.h

Merge remote-tracking branch 'origin/4.2' into 4.3

2017-03-14 16:20:14 +02:00

cmakeproject.cpp

Use project id uniformly as project context

2017-12-20 12:35:14 +00:00

cmakeproject.h

CMake: Enable switching between different temporary CMake configurations

2017-10-24 11:13:42 +00:00

cmakeproject.qrc

Move mimetype definitions to plugin specs

2017-02-27 13:54:59 +00:00

cmakeprojectconstants.h

Use project id uniformly as project context

2017-12-20 12:35:14 +00:00

cmakeprojectimporter.cpp

CMake: Fix project parsing notification

2017-10-06 09:53:40 +00:00

cmakeprojectimporter.h

CMake: Introduce project importer for cmake projects

2017-02-10 10:34:07 +00:00

cmakeprojectmanager_dependencies.pri

CMake: Update qmljs codemodel

2016-04-29 09:08:05 +00:00

cmakeprojectmanager.cpp

Use project id uniformly as project context

2017-12-20 12:35:14 +00:00

cmakeprojectmanager.h

CMakeProjectManager: Clean forward declaration

2017-09-27 07:46:06 +00:00

CMakeProjectManager.json.in

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

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

cmakeprojectmanager.pro

CMake: Fix project parsing notification

2017-10-06 09:53:40 +00:00

cmakeprojectmanager.qbs

CMake: fix qbs build

2017-10-09 05:50:18 +00:00

cmakeprojectnodes.cpp

Move HTML out of translated strings

2018-01-24 10:18:28 +00:00

cmakeprojectnodes.h

CMake: Get rid of <Source Directory> in server-mode

2017-08-04 13:33:56 +00:00

cmakeprojectplugin.cpp

Use project id uniformly as project context

2017-12-20 12:35:14 +00:00

cmakeprojectplugin.h

CMakeProjectManager: Clean forward declaration

2017-09-27 07:46:06 +00:00

cmakerunconfiguration.cpp

CMakeRunConfiguration: Fix warning about unused lambda capture

2018-01-17 09:12:16 +00:00

cmakerunconfiguration.h

ProjectExplorer: Return BuildTargetInfo from availableBuildTarget()

2018-01-05 09:34:29 +00:00

cmakesettingspage.cpp

CMake: Add option to auto-create build directories

2017-09-20 12:39:18 +00:00

cmakesettingspage.h

CMake: Cleanup files

2016-02-12 10:37:13 +00:00

cmaketool.cpp

CMake: Add option to auto-create build directories

2017-09-20 12:39:18 +00:00

cmaketool.h

CMake: Add option to auto-create build directories

2017-09-20 12:39:18 +00:00

cmaketoolmanager.cpp

Do not construct settings/resource paths from QSettings object

2018-01-11 10:42:09 +00:00

cmaketoolmanager.h

CMake: Remove "Prefer Ninja" checkbox on CMake Tool page

2016-02-15 11:06:24 +00:00

configmodel.cpp

CMake: Fix "CMake settings have changed on disk"

2017-10-24 11:10:30 +00:00

configmodel.h

CMake: Fix "CMake settings have changed on disk"

2017-10-24 11:10:30 +00:00

configmodelitemdelegate.cpp

CMake: Improve delegates for CMake configuration

2017-09-19 08:42:20 +00:00

configmodelitemdelegate.h

CMake: Improve delegates for CMake configuration

2017-09-19 08:42:20 +00:00

servermode.cpp

Revert "CMake: Use canonical source directory when talking to cmake server-mode"

2017-04-27 09:51:45 +00:00

servermode.h

CMake: Use shorter names for local sockets in server-mode

2017-01-24 16:12:26 +00:00

servermodereader.cpp

Improve translated strings and make them consistent

2018-01-22 11:56:01 +00:00

servermodereader.h

CMake: Fix project parsing notification

2017-10-06 09:53:40 +00:00

tealeafreader.cpp

CMake: Fix build directory

2017-10-27 09:07:10 +00:00

tealeafreader.h

CMake: Fix project parsing notification

2017-10-06 09:53:40 +00:00

treescanner.cpp

Merge remote-tracking branch 'origin/4.3'

2017-06-26 08:24:26 +03:00

treescanner.h

ProjectExplorer: Do not use version manager cache in threads

2017-06-20 14:24:02 +00:00