Merge branch 'T19874-OptionalQtWebEngine'
0b2cad024e4d
Actions

Description

Merge branch 'T19874-OptionalQtWebEngine'

Details

Provenance

kislinsk	Authored on Aug 19 2016, 2:34 PM
kislinsk	Pushed on Aug 19 2016, 2:35 PM

Parents

rMITK54b35c0624c0: Make QtWebEngine an optional dependency
rMITK8c57782bf3bd: Merge branch 'T19868-LabelSetImage-NodeColor'

Branches

Unknown

Tags

Unknown

Event Timeline

kislinsk committed rMITK0b2cad024e4d: Merge branch 'T19874-OptionalQtWebEngine' (authored by kislinsk).Aug 19 2016, 2:34 PM

Merged Changes

54b35c0624c0 Make QtWebEngine an optional dependency
Author
kislinsk
Browse Repository
No Builds
No Audits

Changes (33)

Path

Size

Packages

CMake/

mitkInstallRules.cmake

O1: MITK Reviewer Group I

CMakeLists.txt

O1: MITK Reviewer Group I

MITKConfig.cmake.in

O1: MITK Reviewer Group I

Modules/

ModuleList.cmake

QtWidgetsExt/

CMakeLists.txt

O3: MITK Reviewer Group II

files.cmake

O3: MITK Reviewer Group II

include/

QmitkHistogramJSWidget.h

O3: MITK Reviewer Group II

resource/

Histogram.css

O3: MITK Reviewer Group II

Histogram.html

O3: MITK Reviewer Group II

Histogram.js

O3: MITK Reviewer Group II

QtWidgetsExt.qrc

O3: MITK Reviewer Group II

d3.v2.js

O3: MITK Reviewer Group II

src/

QmitkHistogramJSWidget.cpp

O3: MITK Reviewer Group II

	QtWidgetsWeb/
	QtWidgetsExt/

include/

QmitkHistogramJSWidget.h

resource/

src/

QmitkHistogramJSWidget.cpp

Plugins/

org.blueberry.ui.qt.help/

CMakeLists.txt

O1: MITK Reviewer Group I

org.mitk.gui.qt.diffusionimagingapp/

CMakeLists.txt

org.mitk.gui.qt.extapplication/

CMakeLists.txt

O1: MITK Reviewer Group I

src/

internal/

QmitkMitkWorkbenchIntroPart.cpp

O1: MITK Reviewer Group I

QmitkMitkWorkbenchIntroPart.h

O1: MITK Reviewer Group I

org.mitk.gui.qt.measurementtoolbox/

CMakeLists.txt

O1: MITK Reviewer Group I

SuperBuild.cmake

O1: MITK Reviewer Group I

rMITK0b2cad024e4d

View Options

CMake/mitkInstallRules.cmake

View Options

CMakeLists.txt

View Options

MITKConfig.cmake.in

View Options

Modules/ModuleList.cmake

View Options

Modules/QtWidgetsExt/CMakeLists.txt

View Options

Modules/QtWidgetsExt/files.cmake

View Options

Modules/QtWidgetsExt/include/QmitkHistogramJSWidget.h

View Options

Modules/QtWidgetsExt/resource/Histogram.css

View Options

Modules/QtWidgetsExt/resource/Histogram.html

View Options

Modules/QtWidgetsExt/resource/Histogram.js

View Options

Modules/QtWidgetsExt/resource/QtWidgetsExt.qrc

View Options

Modules/QtWidgetsExt/resource/d3.v2.js

View Options

Modules/QtWidgetsExt/src/QmitkHistogramJSWidget.cpp

View Options

Modules/QtWidgetsWeb/CMakeLists.txt

View Options

Modules/QtWidgetsWeb/files.cmake

View Options

Modules/QtWidgetsWeb/include/QmitkHistogramJSWidget.h

View Options

Modules/QtWidgetsWeb/resource/Histogram.css

View Options

Modules/QtWidgetsWeb/resource/Histogram.html

View Options

Modules/QtWidgetsWeb/resource/Histogram.js

View Options

Modules/QtWidgetsWeb/resource/QtWidgetsWeb.qrc

View Options

Modules/QtWidgetsWeb/resource/d3.v2.js

View Options

Modules/QtWidgetsWeb/src/QmitkHistogramJSWidget.cpp

View Options

Plugins/org.blueberry.ui.qt.help/CMakeLists.txt

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/CMakeLists.txt

View Options

Plugins/org.mitk.gui.qt.extapplication/CMakeLists.txt

View Options

Plugins/org.mitk.gui.qt.extapplication/src/internal/QmitkMitkWorkbenchIntroPart.cpp

View Options

Plugins/org.mitk.gui.qt.extapplication/src/internal/QmitkMitkWorkbenchIntroPart.h

View Options

Plugins/org.mitk.gui.qt.measurementtoolbox/CMakeLists.txt

View Options

Merge branch 'T19874-OptionalQtWebEngine'0b2cad024e4dActions

Description

Details

Event Timeline

Merged Changes

Changes (33)

rMITK0b2cad024e4d

CMake/mitkInstallRules.cmake

CMakeLists.txt

MITKConfig.cmake.in

Modules/ModuleList.cmake

Modules/QtWidgetsExt/CMakeLists.txt

Modules/QtWidgetsExt/files.cmake

Modules/QtWidgetsExt/include/QmitkHistogramJSWidget.h

Modules/QtWidgetsExt/resource/Histogram.css

Modules/QtWidgetsExt/resource/Histogram.html

Modules/QtWidgetsExt/resource/Histogram.js

Modules/QtWidgetsExt/resource/QtWidgetsExt.qrc

Modules/QtWidgetsExt/resource/d3.v2.js

Modules/QtWidgetsExt/src/QmitkHistogramJSWidget.cpp

Modules/QtWidgetsWeb/CMakeLists.txt

Modules/QtWidgetsWeb/files.cmake

Modules/QtWidgetsWeb/include/QmitkHistogramJSWidget.h

Modules/QtWidgetsWeb/resource/Histogram.css

Modules/QtWidgetsWeb/resource/Histogram.html

Modules/QtWidgetsWeb/resource/Histogram.js

Modules/QtWidgetsWeb/resource/QtWidgetsWeb.qrc

Modules/QtWidgetsWeb/resource/d3.v2.js

Modules/QtWidgetsWeb/src/QmitkHistogramJSWidget.cpp

Plugins/org.blueberry.ui.qt.help/CMakeLists.txt

Plugins/org.mitk.gui.qt.diffusionimagingapp/CMakeLists.txt

Plugins/org.mitk.gui.qt.extapplication/CMakeLists.txt

Plugins/org.mitk.gui.qt.extapplication/src/internal/QmitkMitkWorkbenchIntroPart.cpp

Plugins/org.mitk.gui.qt.extapplication/src/internal/QmitkMitkWorkbenchIntroPart.h

Plugins/org.mitk.gui.qt.measurementtoolbox/CMakeLists.txt

SuperBuild.cmake

Merge branch 'T19874-OptionalQtWebEngine'
0b2cad024e4d
Actions