Fix some Qt5 component issues

Moved ctkDICOMObjectModel to the Widgets library

Libs/DICOM/Core/CMakeLists.txt

@@ -38,8 +38,6 @@ set(KIT_SRCS
   ctkDICOMItem.h
   ctkDICOMModel.cpp
   ctkDICOMModel.h
-  ctkDICOMObjectModel.cpp
-  ctkDICOMObjectModel.h
   ctkDICOMPersonName.cpp
   ctkDICOMPersonName.h
   ctkDICOMQuery.cpp
@@ -105,7 +103,6 @@ set(KIT_MOC_SRCS
   ctkDICOMIndexer_p.h
   ctkDICOMFilterProxyModel.h
   ctkDICOMModel.h
-  ctkDICOMObjectModel.h
   ctkDICOMQuery.h
   ctkDICOMRetrieve.h
   ctkDICOMTester.h
@@ -125,7 +122,7 @@ set(KIT_resources
 ctkFunctionGetTargetLibraries(KIT_target_libraries)
 
 if(CTK_QT_VERSION VERSION_GREATER "4")
-  list(APPEND KIT_target_libraries Qt5::Sql Qt5::Gui)
+  list(APPEND KIT_target_libraries Qt5::Sql)
 endif()
 
 # create a dcm query/retrieve service config file that points to the build dir

Libs/DICOM/Core/Testing/Cpp/CMakeLists.txt

@@ -11,7 +11,6 @@ create_test_sourcelist(Tests ${KIT}CppTests.cpp
   ctkDICOMItemTest1.cpp
   ctkDICOMIndexerTest1.cpp
   ctkDICOMModelTest1.cpp
-  ctkDICOMObjectModelTest1.cpp
   ctkDICOMPersonNameTest1.cpp
   ctkDICOMQueryTest1.cpp
   ctkDICOMQueryTest2.cpp
@@ -29,10 +28,6 @@ set(LIBRARY_NAME ${PROJECT_NAME})
 add_executable(${KIT}CppTests ${Tests})
 target_link_libraries(${KIT}CppTests ${LIBRARY_NAME})
 
-if(CTK_QT_VERSION VERSION_GREATER "4")
-  target_link_libraries(${KIT}CppTests Qt5::Widgets)
-endif()
-
 #
 # Add Tests
 #

Libs/DICOM/Core/ctkDICOMIndexer.cpp

@@ -30,7 +30,6 @@
 #include <QDirIterator>
 #include <QFileInfo>
 #include <QDebug>
-#include <QPixmap>
 
 // ctkDICOM includes
 #include "ctkLogger.h"

Libs/DICOM/Widgets/CMakeLists.txt

@@ -13,6 +13,8 @@ set(KIT_SRCS
   ctkDICOMAppWidget.h
   ctkDICOMBrowser.cpp
   ctkDICOMBrowser.h
+  ctkDICOMObjectModel.cpp
+  ctkDICOMObjectModel.h
   ctkDICOMDirectoryListWidget.cpp
   ctkDICOMDirectoryListWidget.h
   ctkDICOMImage.cpp
@@ -52,6 +54,7 @@ set(KIT_MOC_SRCS
   ctkDICOMImage.h
   ctkDICOMImportWidget.h
   ctkDICOMObjectListWidget.h
+  ctkDICOMObjectModel.h
   ctkDICOMQueryRetrieveWidget.h
   ctkDICOMQueryWidget.h
   ctkDICOMServerNodeWidget.h

Libs/DICOM/Widgets/Testing/Cpp/CMakeLists.txt

@@ -9,6 +9,7 @@ create_test_sourcelist(Tests ${KIT}CppTests.cpp
   ctkDICOMImportWidgetTest1.cpp
   ctkDICOMListenerWidgetTest1.cpp
   ctkDICOMModelTest2.cpp
+  ctkDICOMObjectModelTest1.cpp
   ctkDICOMQueryResultsTabWidgetTest1.cpp
   ctkDICOMQueryRetrieveWidgetTest1.cpp
   ctkDICOMServerNodeWidgetTest1.cpp