Merge branch 'bug-16272-qt5-build-system'
c0d9bca3a8c7
Actions

Description

Merge branch 'bug-16272-qt5-build-system'

Details

Provenance

Authored on Jan 8 2014, 1:35 PM

Parents

rMITK85794f7d68d1: COMP: Moved tutorial steps in separate directories.
rMITKb51bb3bda8e4: Merge branch 'bug-16272-qt5-build-system'

Branches

Unknown

Tags

Unknown

Event Timeline

zelzer committed rMITKc0d9bca3a8c7: Merge branch 'bug-16272-qt5-build-system' (authored by zelzer).Jan 8 2014, 1:35 PM

Merged Changes

85794f7d68d1 COMP: Moved tutorial steps in separate directories.
Author
zelzer
Browse Repository
No Builds
No Audits

Changes (81)

Path

Size

Examples/

Tutorial/

CMakeLists.txt

ITKAndVTK

CMakeLists.txt

	ITKAndVTK/

	files.cmake
	mitkWithITKAndVTK.cmake

mitkWithITKAndVTK.cpp

	Step1/

Step1.cpp

	files.cmake
	Step1.cmake

Step10

Step10.cpp

Step10.h

	Step10/

	Step2/

Step2.cpp

	files.cmake
	Step2.cmake

	Step3/

Step3.cpp

	files.cmake
	Step3.cmake

	Step4/

Step4.cpp

	files.cmake
	Step4.cmake

	Step5/

Step5.cpp

	files.cmake
	Step5.cmake

	Step6/

Step6.cpp

Step6.h

Step6RegionGrowing.txx

Step6RegionGrowing1.cpp

Step6RegionGrowing2.cpp

Step6RegionGrowing3.cpp

Step6main.cpp

	files.cmake
	Step6.cmake

Step6RegionGrowing.txx

Step6RegionGrowing1.cpp

Step6RegionGrowing2.cpp

Step6RegionGrowing3.cpp

	Step7/

	Step8/

Step8.cpp

Step8.h

Step8main.cpp

mitkWithITKAndVTK.cmake

mitkWithITKAndVTK.cpp

Modules/

US/

CMakeLists.txt

rMITKc0d9bca3a8c7

View Options

Examples/Tutorial/CMakeLists.txt

View Options

Examples/Tutorial/ITKAndVTK/CMakeLists.txt

View Options

Examples/Tutorial/ITKAndVTK/files.cmake

View Options

Examples/Tutorial/ITKAndVTK/mitkWithITKAndVTK.cpp

View Options

Examples/Tutorial/Step1.cmake

View Options

Examples/Tutorial/Step1.cpp

View Options

Examples/Tutorial/Step1/CMakeLists.txt

View Options

Examples/Tutorial/Step1/Step1.cpp

View Options

Examples/Tutorial/Step1/files.cmake

View Options

Examples/Tutorial/Step10.cpp

View Options

Examples/Tutorial/Step10.h

View Options

Examples/Tutorial/Step10/Step10.cpp

View Options

Examples/Tutorial/Step10/Step10.h

View Options

Examples/Tutorial/Step2.cmake

View Options

Examples/Tutorial/Step2.cpp

View Options

Examples/Tutorial/Step2/CMakeLists.txt

View Options

Examples/Tutorial/Step2/Step2.cpp

View Options

Examples/Tutorial/Step2/files.cmake

View Options

Examples/Tutorial/Step3.cmake

View Options

Examples/Tutorial/Step3.cpp

View Options

Examples/Tutorial/Step3/CMakeLists.txt

View Options

Examples/Tutorial/Step3/Step3.cpp

View Options

Examples/Tutorial/Step3/files.cmake

View Options

Examples/Tutorial/Step4.cmake

View Options

Examples/Tutorial/Step4.cpp

View Options

Examples/Tutorial/Step4/CMakeLists.txt

View Options

Examples/Tutorial/Step4/Step4.cpp

View Options

Examples/Tutorial/Step4/files.cmake

View Options

Examples/Tutorial/Step5.cmake

View Options

Examples/Tutorial/Step5.cpp

View Options

Examples/Tutorial/Step5/CMakeLists.txt

View Options

Examples/Tutorial/Step5/Step5.cpp

View Options

Examples/Tutorial/Step5/files.cmake

View Options

Examples/Tutorial/Step6.cmake

View Options

Examples/Tutorial/Step6.cpp

View Options

Examples/Tutorial/Step6.h

View Options

Examples/Tutorial/Step6/CMakeLists.txt

View Options

Examples/Tutorial/Step6/Step6.cpp

View Options

Examples/Tutorial/Step6/Step6.h

View Options

Examples/Tutorial/Step6/Step6RegionGrowing.txx

View Options

Examples/Tutorial/Step6/Step6RegionGrowing1.cpp

View Options

Examples/Tutorial/Step6/Step6RegionGrowing2.cpp

View Options

Examples/Tutorial/Step6/Step6RegionGrowing3.cpp

View Options

Examples/Tutorial/Step6/Step6main.cpp

View Options

Examples/Tutorial/Step6/files.cmake

View Options

Examples/Tutorial/Step6RegionGrowing.txx

View Options

Examples/Tutorial/Step6RegionGrowing1.cpp

View Options

Examples/Tutorial/Step6RegionGrowing2.cpp

View Options

Examples/Tutorial/Step6RegionGrowing3.cpp

View Options

Examples/Tutorial/Step6main.cpp

View Options

Examples/Tutorial/Step7.cmake

View Options

Examples/Tutorial/Step7.cpp

View Options

Examples/Tutorial/Step7.h

View Options

Examples/Tutorial/Step7/CMakeLists.txt

View Options

Examples/Tutorial/Step7/Step7.cpp

View Options

Examples/Tutorial/Step7/Step7.h

View Options

Examples/Tutorial/Step7/Step7main.cpp

View Options

Examples/Tutorial/Step7/files.cmake

View Options

Examples/Tutorial/Step7main.cpp

View Options

Examples/Tutorial/Step8.cmake

View Options

Examples/Tutorial/Step8.cpp

View Options

Examples/Tutorial/Step8.h

View Options

Examples/Tutorial/Step8/CMakeLists.txt

View Options

Examples/Tutorial/Step8/Step8.cpp

View Options

Examples/Tutorial/Step8/Step8.h

View Options

Examples/Tutorial/Step8/Step8main.cpp

View Options

Examples/Tutorial/Step8/files.cmake

View Options

Examples/Tutorial/Step8main.cpp

View Options

Examples/Tutorial/mitkWithITKAndVTK.cmake

View Options

Examples/Tutorial/mitkWithITKAndVTK.cpp

View Options

Merge branch 'bug-16272-qt5-build-system'c0d9bca3a8c7Actions

Description

Details

Event Timeline

Merged Changes

Changes (81)

rMITKc0d9bca3a8c7

Examples/Tutorial/CMakeLists.txt

Examples/Tutorial/ITKAndVTK/CMakeLists.txt

Examples/Tutorial/ITKAndVTK/files.cmake

Examples/Tutorial/ITKAndVTK/mitkWithITKAndVTK.cpp

Examples/Tutorial/Step1.cmake

Examples/Tutorial/Step1.cpp

Examples/Tutorial/Step1/CMakeLists.txt

Examples/Tutorial/Step1/Step1.cpp

Examples/Tutorial/Step1/files.cmake

Examples/Tutorial/Step10.cpp

Examples/Tutorial/Step10.h

Examples/Tutorial/Step10/Step10.cpp

Examples/Tutorial/Step10/Step10.h

Examples/Tutorial/Step2.cmake

Examples/Tutorial/Step2.cpp

Examples/Tutorial/Step2/CMakeLists.txt

Examples/Tutorial/Step2/Step2.cpp

Examples/Tutorial/Step2/files.cmake

Examples/Tutorial/Step3.cmake

Examples/Tutorial/Step3.cpp

Examples/Tutorial/Step3/CMakeLists.txt

Examples/Tutorial/Step3/Step3.cpp

Examples/Tutorial/Step3/files.cmake

Examples/Tutorial/Step4.cmake

Examples/Tutorial/Step4.cpp

Examples/Tutorial/Step4/CMakeLists.txt

Examples/Tutorial/Step4/Step4.cpp

Examples/Tutorial/Step4/files.cmake

Examples/Tutorial/Step5.cmake

Examples/Tutorial/Step5.cpp

Examples/Tutorial/Step5/CMakeLists.txt

Examples/Tutorial/Step5/Step5.cpp

Examples/Tutorial/Step5/files.cmake

Examples/Tutorial/Step6.cmake

Examples/Tutorial/Step6.cpp

Examples/Tutorial/Step6.h

Examples/Tutorial/Step6/CMakeLists.txt

Examples/Tutorial/Step6/Step6.cpp

Examples/Tutorial/Step6/Step6.h

Examples/Tutorial/Step6/Step6RegionGrowing.txx

Examples/Tutorial/Step6/Step6RegionGrowing1.cpp

Examples/Tutorial/Step6/Step6RegionGrowing2.cpp

Examples/Tutorial/Step6/Step6RegionGrowing3.cpp

Examples/Tutorial/Step6/Step6main.cpp

Examples/Tutorial/Step6/files.cmake

Examples/Tutorial/Step6RegionGrowing.txx

Examples/Tutorial/Step6RegionGrowing1.cpp

Examples/Tutorial/Step6RegionGrowing2.cpp

Examples/Tutorial/Step6RegionGrowing3.cpp

Examples/Tutorial/Step6main.cpp

Examples/Tutorial/Step7.cmake

Examples/Tutorial/Step7.cpp

Examples/Tutorial/Step7.h

Examples/Tutorial/Step7/CMakeLists.txt

Examples/Tutorial/Step7/Step7.cpp

Examples/Tutorial/Step7/Step7.h

Examples/Tutorial/Step7/Step7main.cpp

Examples/Tutorial/Step7/files.cmake

Examples/Tutorial/Step7main.cpp

Examples/Tutorial/Step8.cmake

Examples/Tutorial/Step8.cpp

Examples/Tutorial/Step8.h

Examples/Tutorial/Step8/CMakeLists.txt

Examples/Tutorial/Step8/Step8.cpp

Examples/Tutorial/Step8/Step8.h

Examples/Tutorial/Step8/Step8main.cpp

Examples/Tutorial/Step8/files.cmake

Examples/Tutorial/Step8main.cpp

Examples/Tutorial/mitkWithITKAndVTK.cmake

Examples/Tutorial/mitkWithITKAndVTK.cpp

Modules/US/CMakeLists.txt

Merge branch 'bug-16272-qt5-build-system'
c0d9bca3a8c7
Actions