phabricator.mitk.org…
8785028b97a7
Actions

Description

Merge branch 'T25191-v2018.04-beta' of ssh://phabricator.mitk.org:2222/source/mitk into T25191-v2018.04-beta

Details

Provenance

• kausch	Authored on Oct 2 2018, 1:30 PM
• kausch	Pushed on Oct 2 2018, 11:32 AM

Parents

rMITK61c9167cc3ef: added static member variable to RenderWindow class to remember last thick slice…
rMITK6020e3ba6ef1: Hint at default install locations of Qt

Branches

Unknown

Tags

Unknown

Event Timeline

• kausch committed rMITK8785028b97a7: Merge branch 'T25191-v2018.04-beta' of ssh://phabricator.mitk.org… (authored by • kausch).Oct 2 2018, 1:30 PM

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

Changes (39)

Path

Size

Packages

Applications/

PluginGenerator/

ProjectTemplate/

CMakeLists.txt

Solstice/

CMakeLists.txt

Workbench/

CMakeLists.txt

CMake/

GetPrerequisites.cmake

O1: MITK Reviewer Group I

PackageDepends/

MITK_Boost_Config.cmake

O1: MITK Reviewer Group I

mitkFunctionCreateModule.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

Modules/

AppUtil/

src/

mitkBaseApplication.cpp

Core/

include/

mitkDataNode.h

O1: MITK Reviewer Group I

mitkPropertyList.h

O1: MITK Reviewer Group I

src/

DataManagement/

mitkBaseData.cpp

O1: MITK Reviewer Group I

mitkPropertyList.cpp

O1: MITK Reviewer Group I

IO/

mitkAbstractFileReader.cpp

O1: MITK Reviewer Group I

mitkIOUtil.cpp

O1: MITK Reviewer Group I

Rendering/

mitkMapper.cpp

O1: MITK Reviewer Group I

test/

mitkPointSetLocaleTest.cpp

O1: MITK Reviewer Group I

DICOMReader/

include/

mitkBaseDICOMReaderService.h

mitkDICOMImageBlockDescriptor.h

src/

mitkBaseDICOMReaderService.cpp

mitkDICOMImageBlockDescriptor.cpp

mitkITKDICOMSeriesReaderHelper.cpp

IGTBase/

src/

mitkRealTimeClock.cpp

Multilabel/

mitkLabel.cpp

O1: MITK Reviewer Group I

mitkLabel.h

O1: MITK Reviewer Group I

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.dicom/

src/

internal/

DicomEventHandler.cpp

org.mitk.gui.qt.segmentation/

documentation/

UserManual/

QmitkSegmentation.dox

O1: MITK Reviewer Group I

README.md

rMITK8785028b97a7

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/PackageDepends/MITK_Boost_Config.cmake

View Options

CMake/mitkFunctionCreateModule.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

Modules/AppUtil/src/mitkBaseApplication.cpp

View Options

Modules/Core/include/mitkDataNode.h

View Options

Modules/Core/include/mitkPropertyList.h

View Options

Modules/Core/src/DataManagement/mitkBaseData.cpp

View Options

Modules/Core/src/DataManagement/mitkPropertyList.cpp

View Options

Modules/Core/src/IO/mitkAbstractFileReader.cpp

View Options

Modules/Core/src/IO/mitkIOUtil.cpp

View Options

Modules/Core/src/Rendering/mitkMapper.cpp

View Options

Modules/Core/test/mitkPointSetLocaleTest.cpp

View Options

Modules/DICOMReader/include/mitkBaseDICOMReaderService.h

View Options

Modules/DICOMReader/include/mitkDICOMImageBlockDescriptor.h

View Options

Modules/DICOMReader/src/mitkBaseDICOMReaderService.cpp

View Options

Modules/DICOMReader/src/mitkDICOMImageBlockDescriptor.cpp

View Options

Modules/DICOMReader/src/mitkITKDICOMSeriesReaderHelper.cpp

View Options

Modules/IGTBase/src/mitkRealTimeClock.cpp

View Options

Modules/Multilabel/mitkLabel.cpp

View Options

Modules/Multilabel/mitkLabel.h

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.dicom/src/internal/DicomEventHandler.cpp

View Options

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

View Options

Merge branch 'T25191-v2018.04-beta' of ssh://phabricator.mitk.org…8785028b97a7Actions

Description

Details

Event Timeline

Merged Changes

Changes (39)

rMITK8785028b97a7

Applications/PluginGenerator/ProjectTemplate/CMakeLists.txt

Applications/Solstice/CMakeLists.txt

Applications/Workbench/CMakeLists.txt

CMake/GetPrerequisites.cmake

CMake/PackageDepends/MITK_Boost_Config.cmake

CMake/mitkFunctionCreateModule.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

Modules/AppUtil/src/mitkBaseApplication.cpp

Modules/Core/include/mitkDataNode.h

Modules/Core/include/mitkPropertyList.h

Modules/Core/src/DataManagement/mitkBaseData.cpp

Modules/Core/src/DataManagement/mitkPropertyList.cpp

Modules/Core/src/IO/mitkAbstractFileReader.cpp

Modules/Core/src/IO/mitkIOUtil.cpp

Modules/Core/src/Rendering/mitkMapper.cpp

Modules/Core/test/mitkPointSetLocaleTest.cpp

Modules/DICOMReader/include/mitkBaseDICOMReaderService.h

Modules/DICOMReader/include/mitkDICOMImageBlockDescriptor.h

Modules/DICOMReader/src/mitkBaseDICOMReaderService.cpp

Modules/DICOMReader/src/mitkDICOMImageBlockDescriptor.cpp

Modules/DICOMReader/src/mitkITKDICOMSeriesReaderHelper.cpp

Modules/IGTBase/src/mitkRealTimeClock.cpp

Modules/Multilabel/mitkLabel.cpp

Modules/Multilabel/mitkLabel.h

Modules/PlanarFigure/src/Interactions/mitkPlanarFigureInteractor.cpp

Modules/QtWidgets/src/QmitkRenderWindowMenu.cpp

Modules/QtWidgetsExt/include/QmitkCrossWidget.h

Plugins/org.mitk.gui.qt.dicom/src/internal/DicomEventHandler.cpp

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

README.md

Merge branch 'T25191-v2018.04-beta' of ssh://phabricator.mitk.org…
8785028b97a7
Actions