Merge remote-tracking branch 'origin/T25191-v2018.04-beta'
b42dbe0dd8b9
Actions

Description

Merge remote-tracking branch 'origin/T25191-v2018.04-beta'

Details

Provenance

kislinsk	Authored on Oct 2 2018, 10:15 AM
kislinsk	Pushed on Oct 2 2018, 10:16 AM

Parents

rMITK6020e3ba6ef1: Hint at default install locations of Qt
rMITK56d1937cafb7: Fixed gcc compile errors of T25441

Branches

Unknown

Tags

Unknown

Event Timeline

kislinsk committed rMITKb42dbe0dd8b9: Merge remote-tracking branch 'origin/T25191-v2018.04-beta' (authored by kislinsk).Oct 2 2018, 10:15 AM

Merged Changes

6020e3ba6ef1 Hint at default install locations of Qt
Author
kislinsk
Browse Repository
No Builds
No Audits
e67f98585e89 Hint at default install locations of Qt
Author
kislinsk
Browse Repository
No Builds
No Audits
21965156e0d2 Fixed gcc compile errors of T25441
Author
floca
Browse Repository
No Builds
No Audits
d93b1bde8192 First fix
Author
floca
Browse Repository
No Builds
No Audits
bb16886d6cbe Improve minimum required version consistency
Author
kislinsk
Browse Repository
No Builds
No Audits
0896968b27a3 Suppress OpenGL deprecation warnings on macOS 10.14
Author
kislinsk
Browse Repository
No Builds
No Audits
c614f933e1e8 Increase minimum supported macOS version to 10.13
Author
kislinsk
Browse Repository
No Builds
No Audits
e376a9c250c0 Another fixup for Boost patch
Author
nolden
Browse Repository
No Builds
No Audits
53778c43fdd1 Deactivate unused parameter warnings on MSVC again
Author
nolden
Browse Repository
No Builds
No Audits
4bc421a754d9 More Boost patch fixups
Author
nolden
Browse Repository
No Builds
No Audits
bdca3357c07f Fixup line endings in Boost patch
Author
nolden
Browse Repository
No Builds
No Audits
bf702e5482e2 Update Boost to 1.68.0 and patch for MSVC 2017
Author
nolden
Browse Repository
No Builds
No Audits
791fc9c1169d Turn on unused parameter warnings for MSVC
Author
nolden
Browse Repository
No Builds
No Audits
2b4ed277a869 Update ITK to 4.13.1
Author
nolden
Browse Repository
No Builds
No Audits
5b398d60b952 Try at least a little to pre-set MSVC redistributable
Author
kislinsk
Browse Repository
No Builds
No Audits
ab862d50bcb6 ThickSlices property is used now
Author
• kausch
Browse Repository
No Builds
No Audits
0dd5b03404fb update
Author
• kausch
Browse Repository
No Builds
Concern Raised
e0e52dd7a560 Merge branch 'T25317-Icon_accent_color_in_light_theme' into T25191-v2018.04-beta
Author
floca
Browse Repository
No Builds
No Audits
c1aa6907f4f0 Merge branch 'T24840-MatchPointIcons' into T25191-v2018.04-beta
Author
floca
Browse Repository
No Builds
No Audits
b495f517233f Add missing include
Author
kislinsk
Browse Repository
No Builds
No Audits
bc019ee0e6ac Disabled some of the photoacoustic lib tests
Author
• groehl
Browse Repository
No Builds
No Audits
b75bdbe648c8 Merge branch 'T24842-lincenseInformationIcons' into T25191-v2018.04-beta
Author
kislinsk
Browse Repository
No Builds
No Audits
286448228567 Add icon licenses
Author
kislinsk
Browse Repository
No Builds
No Audits
c43038d957f9 Merge branch 'T25228-ResolveMatchPointAlgorithmDependencies' into T25191-v2018.
Author
kislinsk
Browse Repository
No Builds
No Audits
cae0c04e3d95 Resolve MatchPoint plugin dependencies
Author
kislinsk
Browse Repository
No Builds
No Audits
3262a064ee33 Merge branch 'T25285-EllipsoidCrash' into T25191-v2018.04-beta
Author
kislinsk
Browse Repository
No Builds
No Audits
4fb32d1ab856 Fix wrong deletion
Author
goyette
Browse Repository
No Builds
No Audits
56e8c249e173 Fix memory leak
Author
Bert
Browse Repository
No Builds
No Audits
9f847931ce4e Fix memory leak
Author
Bert
Browse Repository
No Builds
No Audits
5eec677e798e Merge branch 'T25269-VisualStudioVersions' into T25191-v2018.04-beta
Author
kislinsk
Browse Repository
No Builds
No Audits
8168d71796f3 Simplify check for Visual Studio version
Author
kislinsk
Browse Repository
No Builds
No Audits
cc3f5b3006c7 Dismiss old versions and generically parse supported versions
Author
kislinsk
Browse Repository
No Builds
No Audits
1425be4f70fb Make Visual Studio 2017 minimum supported version
Author
kislinsk
Browse Repository
No Builds
No Audits
94b010102bc4 Collected information about icon usage in plugins.
Author
hentsch
Browse Repository
No Builds
No Audits
0819ff0cb7ef Merge branch 'T25245-addExtensionDirsToMitkConfig' into T25191-v2018.04-beta
Author
hentsch
Browse Repository
No Builds
No Audits
b9a7ce1abb4f T25245
Author
hentsch
Browse Repository
No Builds
No Audits
31daeb16ac31 Use fixed version of CTK working with Qt 5.11.1
Author
kislinsk
Browse Repository
No Builds
No Audits
0bfcde93310f Increase minimum required version of Qt to 5.11.1
Author
kislinsk
Browse Repository
No Builds
No Audits
f2b0d23fb6d1 Use MITK_INSTALL() macro instead of install()
Author
kislinsk
Browse Repository
No Builds
No Audits

Changes (39)

Path

Size

Packages

Applications/

PluginGenerator/

ProjectTemplate/

CMakeLists.txt

Solstice/

CMakeLists.txt

Workbench/

CMakeLists.txt

CMake/

GetPrerequisites.cmake

O1: MITK Reviewer Group I

MITKDashboardScript.TEMPLATE.cmake

O1: MITK Reviewer Group I

PackageDepends/

MITK_Boost_Config.cmake

O1: MITK Reviewer Group I

mitkFunctionCreateMatchPointDeployedAlgorithm.cmake

O1: MITK Reviewer Group I

mitkFunctionCreateModule.cmake

O1: MITK Reviewer Group I

mitkFunctionGetMSVCVersion.cmake

O1: MITK Reviewer Group I

mitkMacroInstall.cmake

O1: MITK Reviewer Group I

mitkSetupCPack.cmake

O1: MITK Reviewer Group I

CMakeExternals/

Boost.cmake

O1: MITK Reviewer Group I

Boost.patch

O1: MITK Reviewer Group I

ChangeBoostLibsInstallNameForMac.cmake.in

O1: MITK Reviewer Group I

ITK-VNL-2018-05-16.patch

O1: MITK Reviewer Group I

ITK.cmake

O1: MITK Reviewer Group I

CMakeLists.txt

O1: MITK Reviewer Group I

Documentation/

Doxygen/

3-DeveloperManual/

Application/

Deployment.dox

Starting/

SettingUpMITK/

BuildInstructions.dox

SupportedPlatforms.md

Licenses

ICONS.md

lgpl-2.1.txt

	Licenses/
	Plugins/

	CC-BY-3.0.txt/
	org.blueberry.ui.qt/	resources/	fonts/	xkcd/


	license.txt


	org.blueberry.ui.qt/	resources/	fonts/	FiraSans/

OFL.txt

Modules/

AppUtil/

src/

mitkBaseApplication.cpp

Core/

src/

Controllers/

mitkLimitedLinearUndo.cpp

O1: MITK Reviewer Group I

mitkVerboseLimitedLinearUndo.cpp

O1: MITK Reviewer Group I

Rendering/

vtkMitkThickSlicesFilter.cpp

O1: MITK Reviewer Group I

DICOMReader/

src/

mitkITKDICOMSeriesReaderHelper.cpp

DataTypesExt/

src/

mitkEllipsoid.cpp

IGTBase/

src/

mitkRealTimeClock.cpp

PhotoacousticsLib/

test/

files.cmake

PlanarFigure/

src/

Interactions/

mitkPlanarFigureInteractor.cpp

O1: MITK Reviewer Group I

QtWidgets/

src/

QmitkRenderWindowMenu.cpp

O3: MITK Reviewer Group II

QtWidgetsExt/

include/

QmitkCrossWidget.h

O3: MITK Reviewer Group II

Plugins/

org.mitk.gui.qt.segmentation/

documentation/

UserManual/

QmitkSegmentation.dox

O1: MITK Reviewer Group I

README.md

mitkConfig.h.in

rMITKb42dbe0dd8b9

View Options

Applications/PluginGenerator/ProjectTemplate/CMakeLists.txt

View Options

Applications/Solstice/CMakeLists.txt

View Options

Applications/Workbench/CMakeLists.txt

View Options

CMake/GetPrerequisites.cmake

View Options

CMake/MITKDashboardScript.TEMPLATE.cmake

View Options

CMake/PackageDepends/MITK_Boost_Config.cmake

View Options

CMake/mitkFunctionCreateMatchPointDeployedAlgorithm.cmake

View Options

CMake/mitkFunctionCreateModule.cmake

View Options

CMake/mitkFunctionGetMSVCVersion.cmake

View Options

CMake/mitkMacroInstall.cmake

View Options

CMake/mitkSetupCPack.cmake

View Options

CMakeExternals/Boost.cmake

View Options

CMakeExternals/Boost.patch

View Options

CMakeExternals/ChangeBoostLibsInstallNameForMac.cmake.in

View Options

CMakeExternals/ITK-VNL-2018-05-16.patch

View Options

CMakeExternals/ITK.cmake

View Options

CMakeLists.txt

View Options

Documentation/Doxygen/3-DeveloperManual/Application/Deployment.dox

View Options

Documentation/Doxygen/3-DeveloperManual/Starting/SettingUpMITK/BuildInstructions.dox

View Options

Documentation/Doxygen/3-DeveloperManual/Starting/SettingUpMITK/SupportedPlatforms.md

View Options

Licenses/CC-BY-3.0.txt

View Options

Licenses/ICONS.md

View Options

Licenses/OFL.txt

View Options

Licenses/lgpl-2.1.txt

View Options

Modules/AppUtil/src/mitkBaseApplication.cpp

View Options

Modules/Core/src/Controllers/mitkLimitedLinearUndo.cpp

View Options

Modules/Core/src/Controllers/mitkVerboseLimitedLinearUndo.cpp

View Options

Modules/Core/src/Rendering/vtkMitkThickSlicesFilter.cpp

View Options

Modules/DICOMReader/src/mitkITKDICOMSeriesReaderHelper.cpp

View Options

Modules/DataTypesExt/src/mitkEllipsoid.cpp

View Options

Modules/IGTBase/src/mitkRealTimeClock.cpp

View Options

Modules/PhotoacousticsLib/test/files.cmake

View Options

Modules/PlanarFigure/src/Interactions/mitkPlanarFigureInteractor.cpp

View Options

Modules/QtWidgets/src/QmitkRenderWindowMenu.cpp

View Options

Modules/QtWidgetsExt/include/QmitkCrossWidget.h

View Options

Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/QmitkSegmentation.dox

View Options

README.md

View Options

Merge remote-tracking branch 'origin/T25191-v2018.04-beta'b42dbe0dd8b9Actions

Description

Details

Event Timeline

Merged Changes

Changes (39)

rMITKb42dbe0dd8b9

Applications/PluginGenerator/ProjectTemplate/CMakeLists.txt

Applications/Solstice/CMakeLists.txt

Applications/Workbench/CMakeLists.txt

CMake/GetPrerequisites.cmake

CMake/MITKDashboardScript.TEMPLATE.cmake

CMake/PackageDepends/MITK_Boost_Config.cmake

CMake/mitkFunctionCreateMatchPointDeployedAlgorithm.cmake

CMake/mitkFunctionCreateModule.cmake

CMake/mitkFunctionGetMSVCVersion.cmake

CMake/mitkMacroInstall.cmake

CMake/mitkSetupCPack.cmake

CMakeExternals/Boost.cmake

CMakeExternals/Boost.patch

CMakeExternals/ChangeBoostLibsInstallNameForMac.cmake.in

CMakeExternals/ITK-VNL-2018-05-16.patch

CMakeExternals/ITK.cmake

CMakeLists.txt

Documentation/Doxygen/3-DeveloperManual/Application/Deployment.dox

Documentation/Doxygen/3-DeveloperManual/Starting/SettingUpMITK/BuildInstructions.dox

Documentation/Doxygen/3-DeveloperManual/Starting/SettingUpMITK/SupportedPlatforms.md

Licenses/CC-BY-3.0.txt

Licenses/ICONS.md

Licenses/OFL.txt

Licenses/lgpl-2.1.txt

Modules/AppUtil/src/mitkBaseApplication.cpp

Modules/Core/src/Controllers/mitkLimitedLinearUndo.cpp

Modules/Core/src/Controllers/mitkVerboseLimitedLinearUndo.cpp

Modules/Core/src/Rendering/vtkMitkThickSlicesFilter.cpp

Modules/DICOMReader/src/mitkITKDICOMSeriesReaderHelper.cpp

Modules/DataTypesExt/src/mitkEllipsoid.cpp

Modules/IGTBase/src/mitkRealTimeClock.cpp

Modules/PhotoacousticsLib/test/files.cmake

Modules/PlanarFigure/src/Interactions/mitkPlanarFigureInteractor.cpp

Modules/QtWidgets/src/QmitkRenderWindowMenu.cpp

Modules/QtWidgetsExt/include/QmitkCrossWidget.h

Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/QmitkSegmentation.dox

README.md

mitkConfig.h.in

Merge remote-tracking branch 'origin/T25191-v2018.04-beta'
b42dbe0dd8b9
Actions