Merge branch 'bug-18872-module-context-nullptr'
29f622d29463
Actions

Description

Merge branch 'bug-18872-module-context-nullptr'

Conflicts:
CMake/mitkMacroCreateModuleTests.cmake
Core/Code/Testing/CMakeLists.txt
Modules/Core/src/IO/mitkFileWriterRegistry.cpp

Details

Provenance

zelzer

Authored on Mar 19 2015, 1:31 PM

Parents

rMITKef12b9b6e9eb: Add a module context automatically to all MITK test drivers.
rMITK5353148eb117: Merge branch 'bug-18644-MitkCannotWritePng'

Branches

Unknown

Tags

Unknown

Event Timeline

zelzer committed rMITK29f622d29463: Merge branch 'bug-18872-module-context-nullptr' (authored by zelzer).Mar 19 2015, 1:31 PM

Merged Changes

ef12b9b6e9eb Add a module context automatically to all MITK test drivers.
Author
zelzer
Browse Repository
No Builds
No Audits
54bdc3e49700 Improve module context handling and error reporting.
Author
zelzer
Browse Repository
No Builds
No Audits

Changes (9)

Path

Size

Packages

CMake/

mitkMacroCreateModuleTests.cmake

O1: MITK Reviewer Group I

Modules/

Core/

src/

IO/

mitkFileReaderRegistry.cpp

O1: MITK Reviewer Group I

mitkFileWriterRegistry.cpp

O1: MITK Reviewer Group I

mitkCoreServices.cpp

O1: MITK Reviewer Group I

test/

CMakeLists.txt

O1: MITK Reviewer Group I

CppMicroServices/

core/

include/

usGetModuleContext.h

O1: MITK Reviewer Group I

OpenCL/

Testing/

mitkOclResourceServiceTest.cpp

Persistence/

Testing/

CMakeLists.txt

Segmentation/

Testing/

CMakeLists.txt

O1: MITK Reviewer Group I

rMITK29f622d29463

View Options

CMake/mitkMacroCreateModuleTests.cmake

View Options

Modules/Core/src/IO/mitkFileReaderRegistry.cpp

View Options

Modules/Core/src/IO/mitkFileWriterRegistry.cpp

View Options

Modules/Core/src/mitkCoreServices.cpp

View Options

Modules/Core/test/CMakeLists.txt

View Options

Modules/CppMicroServices/core/include/usGetModuleContext.h

View Options

Modules/OpenCL/Testing/mitkOclResourceServiceTest.cpp

View Options

Modules/Persistence/Testing/CMakeLists.txt

View Options

Modules/Segmentation/Testing/CMakeLists.txt

Merge branch 'bug-18872-module-context-nullptr'29f622d29463Actions

Description

Details

Event Timeline

Merged Changes

Changes (9)

rMITK29f622d29463

CMake/mitkMacroCreateModuleTests.cmake

Modules/Core/src/IO/mitkFileReaderRegistry.cpp

Modules/Core/src/IO/mitkFileWriterRegistry.cpp

Modules/Core/src/mitkCoreServices.cpp

Modules/Core/test/CMakeLists.txt

Modules/CppMicroServices/core/include/usGetModuleContext.h

Modules/OpenCL/Testing/mitkOclResourceServiceTest.cpp

Modules/Persistence/Testing/CMakeLists.txt

Modules/Segmentation/Testing/CMakeLists.txt

Merge branch 'bug-18872-module-context-nullptr'
29f622d29463
Actions