Merge branch 'T24609-v2018.04-alpha' into T24827-Qt-5.11
564ef6f00d3f
Actions

Description

Merge branch 'T24609-v2018.04-alpha' into T24827-Qt-5.11

Details

Provenance

kislinsk	Authored on Jun 4 2018, 12:21 PM
kislinsk	Pushed on Jun 4 2018, 12:36 PM

Parents

rMITKc9349227ebe3: Fixed errors in wrong T24196 merge
rMITK90db1543a5ad: Remove call to qt5_use_modules()

Branches

Unknown

Tags

Unknown

Event Timeline

kislinsk committed rMITK564ef6f00d3f: Merge branch 'T24609-v2018.04-alpha' into T24827-Qt-5.11 (authored by kislinsk).Jun 4 2018, 12:21 PM

Merged Changes

c9349227ebe3 Fixed errors in wrong T24196 merge
Author
floca
Browse Repository
No Builds
No Audits
2c79df5ec804 Merge branch 'T24196-Integration-alpha' into T24609-v2018.04-alpha
Author
floca
Browse Repository
No Builds
No Audits
de77f06db183 Merge additional fixes brought up by review D126
Author
floca
Browse Repository
No Builds
No Audits
7b24ac13aee1 Fixed some additional issues brought up by review D126
Author
floca
Browse Repository
No Builds
No Audits
55f87da008f2 Merge branch 'T24827-Qt-5.11' into T24609-v2018.04-alpha
Author
kislinsk
Browse Repository
No Builds
No Audits

Changes (22)

Path

Size

Packages

Modules/

QtWidgets/

files.cmake

O3: MITK Reviewer Group II

include/

QmitkDataStorageInspectorGenerator.h

O3: MITK Reviewer Group II

QmitkDataStorageInspectorProviderBase.h

O3: MITK Reviewer Group II

QmitkDataStorageListInspector.h

O3: MITK Reviewer Group II

QmitkDataStorageTreeInspector.h

O3: MITK Reviewer Group II

QmitkIDataStorageInspectorProvider.h

O3: MITK Reviewer Group II

mitkDataStorageInspectorGenerator.h

O3: MITK Reviewer Group II

	mitkIDataStorageInspectorProvider.h
	QmitkIDataStorageInspectorProvider.h

O3: MITK Reviewer Group II

src/

QmitkDataStorageInspectorGenerator.cpp

O3: MITK Reviewer Group II

QmitkIDataStorageInspectorProvider.cpp

O3: MITK Reviewer Group II

	mitkDataStorageInspectorGenerator.cpp
	QmitkDataStorageInspectorGenerator.cpp

O3: MITK Reviewer Group II

	mitkIDataStorageInspectorProvider.cpp
	QmitkIDataStorageInspectorProvider.cpp

O3: MITK Reviewer Group II

mitkQtWidgetsActivator.h

O3: MITK Reviewer Group II

Plugins/

org.mitk.gui.qt.common/

src/

QmitkAbstractNodeSelectionWidget.cpp

O1: MITK Reviewer Group I

QmitkAbstractNodeSelectionWidget.h

O1: MITK Reviewer Group I

QmitkMultiNodeSelectionWidget.cpp

O1: MITK Reviewer Group I

QmitkMultiNodeSelectionWidget.h

O1: MITK Reviewer Group I

QmitkNodeSelectionDialog.cpp

O1: MITK Reviewer Group I

QmitkSingleNodeSelectionWidget.cpp

O1: MITK Reviewer Group I

QmitkSingleNodeSelectionWidget.h

O1: MITK Reviewer Group I

internal/

QmitkNodeSelectionPreferencePage.cpp

O1: MITK Reviewer Group I

QmitkNodeSelectionPreferencePage.h

O1: MITK Reviewer Group I

rMITK564ef6f00d3f

View Options

Modules/QtWidgets/files.cmake

View Options

Modules/QtWidgets/include/QmitkDataStorageInspectorGenerator.h

View Options

Modules/QtWidgets/include/QmitkDataStorageInspectorProviderBase.h

View Options

Modules/QtWidgets/include/QmitkDataStorageListInspector.h

View Options

Modules/QtWidgets/include/QmitkDataStorageTreeInspector.h

View Options

Modules/QtWidgets/include/QmitkIDataStorageInspectorProvider.h

View Options

Modules/QtWidgets/include/mitkDataStorageInspectorGenerator.h

View Options

Modules/QtWidgets/include/mitkIDataStorageInspectorProvider.h

View Options

Modules/QtWidgets/src/QmitkDataStorageInspectorGenerator.cpp

View Options

Modules/QtWidgets/src/QmitkIDataStorageInspectorProvider.cpp

View Options

Modules/QtWidgets/src/mitkDataStorageInspectorGenerator.cpp

View Options

Modules/QtWidgets/src/mitkIDataStorageInspectorProvider.cpp

View Options

Modules/QtWidgets/src/mitkQtWidgetsActivator.h

View Options

Plugins/org.mitk.gui.qt.common/src/QmitkAbstractNodeSelectionWidget.cpp

View Options

Plugins/org.mitk.gui.qt.common/src/QmitkAbstractNodeSelectionWidget.h

View Options

Plugins/org.mitk.gui.qt.common/src/QmitkMultiNodeSelectionWidget.cpp

View Options

Plugins/org.mitk.gui.qt.common/src/QmitkMultiNodeSelectionWidget.h

View Options

Plugins/org.mitk.gui.qt.common/src/QmitkNodeSelectionDialog.cpp

View Options

Plugins/org.mitk.gui.qt.common/src/QmitkSingleNodeSelectionWidget.cpp

View Options

Plugins/org.mitk.gui.qt.common/src/QmitkSingleNodeSelectionWidget.h

View Options

Plugins/org.mitk.gui.qt.common/src/internal/QmitkNodeSelectionPreferencePage.cpp

View Options

Plugins/org.mitk.gui.qt.common/src/internal/QmitkNodeSelectionPreferencePage.h

Merge branch 'T24609-v2018.04-alpha' into T24827-Qt-5.11564ef6f00d3fActions

Description

Details

Event Timeline

Merged Changes

Changes (22)

rMITK564ef6f00d3f

Modules/QtWidgets/files.cmake

Modules/QtWidgets/include/QmitkDataStorageInspectorGenerator.h

Modules/QtWidgets/include/QmitkDataStorageInspectorProviderBase.h

Modules/QtWidgets/include/QmitkDataStorageListInspector.h

Modules/QtWidgets/include/QmitkDataStorageTreeInspector.h

Modules/QtWidgets/include/QmitkIDataStorageInspectorProvider.h

Modules/QtWidgets/include/mitkDataStorageInspectorGenerator.h

Modules/QtWidgets/include/mitkIDataStorageInspectorProvider.h

Modules/QtWidgets/src/QmitkDataStorageInspectorGenerator.cpp

Modules/QtWidgets/src/QmitkIDataStorageInspectorProvider.cpp

Modules/QtWidgets/src/mitkDataStorageInspectorGenerator.cpp

Modules/QtWidgets/src/mitkIDataStorageInspectorProvider.cpp

Modules/QtWidgets/src/mitkQtWidgetsActivator.h

Plugins/org.mitk.gui.qt.common/src/QmitkAbstractNodeSelectionWidget.cpp

Plugins/org.mitk.gui.qt.common/src/QmitkAbstractNodeSelectionWidget.h

Plugins/org.mitk.gui.qt.common/src/QmitkMultiNodeSelectionWidget.cpp

Plugins/org.mitk.gui.qt.common/src/QmitkMultiNodeSelectionWidget.h

Plugins/org.mitk.gui.qt.common/src/QmitkNodeSelectionDialog.cpp

Plugins/org.mitk.gui.qt.common/src/QmitkSingleNodeSelectionWidget.cpp

Plugins/org.mitk.gui.qt.common/src/QmitkSingleNodeSelectionWidget.h

Plugins/org.mitk.gui.qt.common/src/internal/QmitkNodeSelectionPreferencePage.cpp

Plugins/org.mitk.gui.qt.common/src/internal/QmitkNodeSelectionPreferencePage.h

Merge branch 'T24609-v2018.04-alpha' into T24827-Qt-5.11
564ef6f00d3f
Actions