Eike Ziller 0b10ecc718 Merge remote-tracking branch 'origin/4.6' ...

Conflicts:
	src/plugins/cmakeprojectmanager/cmakeproject.h
	src/plugins/debugger/debuggerplugin.cpp
	src/plugins/ios/iosrunfactories.cpp
	src/plugins/nim/project/nimproject.h
	src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
	src/plugins/qmakeandroidsupport/qmakeandroidrunfactories.cpp
	src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp
	src/plugins/qmlprojectmanager/qmlproject.h
	src/plugins/qnx/qnxrunconfigurationfactory.cpp
	src/plugins/qtsupport/exampleslistmodel.cpp
	src/plugins/winrt/winrtrunfactories.cpp

Change-Id: Ib029fdbaa65270426332f5edd6e90264be5fb539

2018-03-13 11:25:38 +01:00

..

imports

qbs build: Use project-global destination dir for libs and plugins

2018-02-12 15:34:18 +00:00

modules

Merge remote-tracking branch 'origin/4.6'

2018-03-13 11:25:38 +01:00