Merge branch 'T23985-macOS'
7b564900ef3b
Actions

Description

Merge branch 'T23985-macOS'

Details

Provenance

kislinsk	Authored on Dec 21 2017, 2:31 PM
kislinsk	Pushed on Dec 21 2017, 2:32 PM

Parents

rMITK751cad5cc159: Remove debug output
rMITKb7c20d3e8f55: Merge branch 'T23775-warnings-no-errors-for-apps'

Branches

Unknown

Tags

Unknown

Event Timeline

kislinsk committed rMITK7b564900ef3b: Merge branch 'T23985-macOS' (authored by kislinsk).Dec 21 2017, 2:31 PM

Merged Changes

751cad5cc159 Remove debug output
Author
kislinsk
Browse Repository
No Builds
No Audits
19500034a3d0 Merge remote-tracking branch 'MattClarkson/19784-mac-rendering' into T23985…
Author
kislinsk
Browse Repository
No Builds
No Audits
f26d293d9b70 Make platform specific switch compatible to macOS
Author
kislinsk
Browse Repository
No Builds
No Audits
cdd7adc13ffa Remove unused parameter name
Author
kislinsk
Browse Repository
No Builds
No Audits
9f8b087070ea Disable OSAtomic.h optimizations for macOS 10.12 and later
Author
kislinsk
Browse Repository
No Builds
No Audits
709e1ebc1bd1 Fix syntax error in logging statement caused by outputting Qt::WindowFlags
Author
clarkson
Browse Repository
No Builds
No Audits
8e04e20fbb3c Dont delete vtkRenderWindow in mitk::BaseRenderer as noe QVTKOpenGLWidget…
Author
clarkson
Browse Repository
No Builds
No Audits
0857201939d5 Update explanation of overloaded resizeGL.
Author
clarkson
Browse Repository
No Builds
No Audits
8a1e0f18793b Put mitk::RenderWindowBase initialisation back to where it was before.
Author
clarkson
Browse Repository
No Builds
No Audits
41398c4577d6 Force immediate update when resizing.
Author
clarkson
Browse Repository
No Builds
No Audits
77635882ae3c Plug in new QVTKOpenGLWidget, but not updating.
Author
clarkson
Browse Repository
No Builds
No Audits
18b05cb10cd9 Correct use of direct.h for Mac
Author
clarkson
Browse Repository
No Builds
No Audits
c8437808f32d Work-around variable not used warning on Mac.
Author
clarkson
Browse Repository
No Builds
No Audits

Changes (9)

Path

Size

Packages

Modules/

AppUtil/

CMakeLists.txt

src/

mitkBaseApplication.cpp

Core/

src/

Rendering/

mitkRenderWindowBase.cpp

O1: MITK Reviewer Group I

CppMicroServices/

core/

src/

util/

usThreads_p.h

O1: MITK Reviewer Group I

PhotoacousticsLib/

MitkMCxyz/

MitkMCxyz.cpp

src/

Generator/

mitkPASimulationBatchGenerator.cpp

QtWidgets/

include/

QmitkRenderWindow.h

O3: MITK Reviewer Group II

src/

QmitkRenderWindow.cpp

O3: MITK Reviewer Group II

QmitkRenderWindowMenu.cpp

O3: MITK Reviewer Group II

rMITK7b564900ef3b

View Options

Modules/AppUtil/CMakeLists.txt

View Options

Modules/AppUtil/src/mitkBaseApplication.cpp

View Options

Modules/Core/src/Rendering/mitkRenderWindowBase.cpp

View Options

Modules/CppMicroServices/core/src/util/usThreads_p.h

View Options

Modules/PhotoacousticsLib/MitkMCxyz/MitkMCxyz.cpp

View Options

Modules/PhotoacousticsLib/src/Generator/mitkPASimulationBatchGenerator.cpp

View Options

Modules/QtWidgets/include/QmitkRenderWindow.h

View Options

Modules/QtWidgets/src/QmitkRenderWindow.cpp

View Options

Modules/QtWidgets/src/QmitkRenderWindowMenu.cpp

Merge branch 'T23985-macOS'7b564900ef3bActions

Description

Details

Event Timeline

Merged Changes

Changes (9)

rMITK7b564900ef3b

Modules/AppUtil/CMakeLists.txt

Modules/AppUtil/src/mitkBaseApplication.cpp

Modules/Core/src/Rendering/mitkRenderWindowBase.cpp

Modules/CppMicroServices/core/src/util/usThreads_p.h

Modules/PhotoacousticsLib/MitkMCxyz/MitkMCxyz.cpp

Modules/PhotoacousticsLib/src/Generator/mitkPASimulationBatchGenerator.cpp

Modules/QtWidgets/include/QmitkRenderWindow.h

Modules/QtWidgets/src/QmitkRenderWindow.cpp

Modules/QtWidgets/src/QmitkRenderWindowMenu.cpp

Merge branch 'T23985-macOS'
7b564900ef3b
Actions