diff --git a/Examples/BlueBerryExampleLauncher/CMakeLists.txt b/Examples/BlueBerryExampleLauncher/CMakeLists.txt index 2cd2b7188d..3ce31cf4e1 100644 --- a/Examples/BlueBerryExampleLauncher/CMakeLists.txt +++ b/Examples/BlueBerryExampleLauncher/CMakeLists.txt @@ -1,85 +1,93 @@ project(BlueBerryExampleLauncher) set(_source_files BlueBerryExampleLauncher.cpp BlueBerryExampleLauncherDialog.cpp ) set(_source_moc_h_files BlueBerryExampleLauncherDialog.h ) set(_source_ui_files BlueBerryExampleLauncherDialog.ui ) # this is a workaround for Visual Studio. The relative include paths in the generated # moc files can get very long and can't be resolved by the MSVC compiler. foreach(_moc_src ${_source_moc_h_files}) - qt4_wrap_cpp(_source_files ${_moc_src} OPTIONS -f${_moc_src}) + if (DESIRED_QT_VERSION MATCHES "5") + qt5_wrap_cpp(_source_files ${_moc_src} OPTIONS -f${_moc_src}) + else() + qt4_wrap_cpp(_source_files ${_moc_src} OPTIONS -f${_moc_src}) + endif() endforeach() -qt4_wrap_ui(_source_files ${_source_ui_files}) +if (DESIRED_QT_VERSION MATCHES "5") + qt5_wrap_ui(_source_files ${_source_ui_files}) +else() + qt4_wrap_ui(_source_files ${_source_ui_files}) +endif() include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) #----------------------------------------------------------------------------- # Create provisioning files #----------------------------------------------------------------------------- set(_plugins_for_all_demos org.blueberry.compat ) file(GLOB _demo_configurations Configurations/*.cmake) set(ALL_REQUIRED_PLUGINS ${_plugins_for_all_demos}) foreach(_demo_config_file ${_demo_configurations}) set(REQUIRED_PLUGINS ) set(DESCRIPTION ) include(${_demo_config_file}) get_filename_component(_name ${_demo_config_file} NAME_WE) FunctionCreateProvisioningFile(FILE ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${PROJECT_NAME}_${_name}.provisioning PLUGINS ${REQUIRED_PLUGINS} ${_plugins_for_all_demos} NO_INSTALL ) if(DESCRIPTION) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/BlueBerryExampleDescription.txt ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${PROJECT_NAME}_${_name}.txt @ONLY) endif() list(APPEND ALL_REQUIRED_PLUGINS ${REQUIRED_PLUGINS}) endforeach() list(REMOVE_DUPLICATES ALL_REQUIRED_PLUGINS) set(ALL_REQUIRED_PLUGIN_TARGETS ) foreach(req_plugin ${ALL_REQUIRED_PLUGINS}) string(REPLACE "." "_" _plugin_target ${req_plugin}) if(TARGET ${_plugin_target}) list(APPEND ALL_REQUIRED_PLUGIN_TARGETS ${_plugin_target}) endif() endforeach() #----------------------------------------------------------------------------- # Create the example launcher #----------------------------------------------------------------------------- FunctionCreateBlueBerryApplication( NAME ${PROJECT_NAME} DESCRIPTION "MITK Application Framework Demo" SOURCES ${_source_files} # PLUGINS ${ALL_REQUIRED_PLUGIN_TARGETS} NO_PROVISIONING NO_INSTALL SHOW_CONSOLE ) -mitk_use_modules(TARGET ${PROJECT_NAME} PACKAGES Qt4|QtGui) +mitk_use_modules(TARGET ${PROJECT_NAME} PACKAGES Qt4|QtGui Qt5|Widgets) add_dependencies(${PROJECT_NAME} ${ALL_REQUIRED_PLUGIN_TARGETS}) # subproject support set_property(TARGET ${PROJECT_NAME} PROPERTY LABELS ${MITK_DEFAULT_SUBPROJECTS}) foreach(subproject ${MITK_DEFAULT_SUBPROJECTS}) add_dependencies(${subproject} ${PROJECT_NAME}) endforeach() diff --git a/Examples/Plugins/org.mitk.example.gui.customviewer.views/src/internal/org_mitk_example_gui_customviewer_views_Activator.cpp b/Examples/Plugins/org.mitk.example.gui.customviewer.views/src/internal/org_mitk_example_gui_customviewer_views_Activator.cpp index dc35d5ddc5..4eda975a56 100644 --- a/Examples/Plugins/org.mitk.example.gui.customviewer.views/src/internal/org_mitk_example_gui_customviewer_views_Activator.cpp +++ b/Examples/Plugins/org.mitk.example.gui.customviewer.views/src/internal/org_mitk_example_gui_customviewer_views_Activator.cpp @@ -1,48 +1,49 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #include "org_mitk_example_gui_customviewer_views_Activator.h" #include "DicomView.h" #include "SimpleRenderWindowView.h" #include ctkPluginContext* org_mitk_example_gui_customviewer_views_Activator::PluginContext = 0; void org_mitk_example_gui_customviewer_views_Activator::start(ctkPluginContext* context) { BERRY_REGISTER_EXTENSION_CLASS(DicomView, context) BERRY_REGISTER_EXTENSION_CLASS(SimpleRenderWindowView, context) PluginContext = context; } void org_mitk_example_gui_customviewer_views_Activator::stop(ctkPluginContext* context) { Q_UNUSED(context) PluginContext = 0; } ctkPluginContext* org_mitk_example_gui_customviewer_views_Activator::GetPluginContext() { return PluginContext; } -Q_EXPORT_PLUGIN2(org_mitk_example_gui_customviewer_views, org_mitk_example_gui_customviewer_views_Activator) - +#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) + Q_EXPORT_PLUGIN2(org_mitk_example_gui_customviewer_views, org_mitk_example_gui_customviewer_views_Activator) +#endif diff --git a/Examples/Plugins/org.mitk.example.gui.customviewer.views/src/internal/org_mitk_example_gui_customviewer_views_Activator.h b/Examples/Plugins/org.mitk.example.gui.customviewer.views/src/internal/org_mitk_example_gui_customviewer_views_Activator.h index 5f84e99346..576c37adcf 100644 --- a/Examples/Plugins/org.mitk.example.gui.customviewer.views/src/internal/org_mitk_example_gui_customviewer_views_Activator.h +++ b/Examples/Plugins/org.mitk.example.gui.customviewer.views/src/internal/org_mitk_example_gui_customviewer_views_Activator.h @@ -1,44 +1,47 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #ifndef org_mitk_example_gui_customviewer_views_Activator_H #define org_mitk_example_gui_customviewer_views_Activator_H #include class ctkPluginContext; class org_mitk_example_gui_customviewer_views_Activator : public QObject, public ctkPluginActivator { Q_OBJECT +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) + Q_PLUGIN_METADATA(IID "org_mitk_example_gui_customviewer_views") +#endif Q_INTERFACES(ctkPluginActivator) public: void start(ctkPluginContext* context); void stop(ctkPluginContext* context); static ctkPluginContext* GetPluginContext(); private: static ctkPluginContext* PluginContext; }; #endif // org_mitk_example_gui_customviewer_views_Activator_H diff --git a/Examples/Plugins/org.mitk.example.gui.customviewer/src/internal/org_mitk_example_gui_customviewer_Activator.cpp b/Examples/Plugins/org.mitk.example.gui.customviewer/src/internal/org_mitk_example_gui_customviewer_Activator.cpp index 518103ebb2..2a48532fa0 100644 --- a/Examples/Plugins/org.mitk.example.gui.customviewer/src/internal/org_mitk_example_gui_customviewer_Activator.cpp +++ b/Examples/Plugins/org.mitk.example.gui.customviewer/src/internal/org_mitk_example_gui_customviewer_Activator.cpp @@ -1,50 +1,51 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #include "org_mitk_example_gui_customviewer_Activator.h" #include "CustomViewer.h" #include "ViewerPerspective.h" #include "DicomPerspective.h" #include ctkPluginContext* org_mitk_example_gui_customviewer_Activator::PluginContext = 0; void org_mitk_example_gui_customviewer_Activator::start(ctkPluginContext* context) { BERRY_REGISTER_EXTENSION_CLASS(CustomViewer, context) BERRY_REGISTER_EXTENSION_CLASS(ViewerPerspective, context) BERRY_REGISTER_EXTENSION_CLASS(DicomPerspective, context) PluginContext = context; } void org_mitk_example_gui_customviewer_Activator::stop(ctkPluginContext* context) { Q_UNUSED(context) PluginContext = 0; } ctkPluginContext* org_mitk_example_gui_customviewer_Activator::GetPluginContext() { return PluginContext; } -Q_EXPORT_PLUGIN2(org_mitk_example_gui_customviewer, org_mitk_example_gui_customviewer_Activator) - +#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) + Q_EXPORT_PLUGIN2(org_mitk_example_gui_customviewer, org_mitk_example_gui_customviewer_Activator) +#endif diff --git a/Examples/Plugins/org.mitk.example.gui.customviewer/src/internal/org_mitk_example_gui_customviewer_Activator.h b/Examples/Plugins/org.mitk.example.gui.customviewer/src/internal/org_mitk_example_gui_customviewer_Activator.h index 22dd6970c1..27a2b0e9c8 100644 --- a/Examples/Plugins/org.mitk.example.gui.customviewer/src/internal/org_mitk_example_gui_customviewer_Activator.h +++ b/Examples/Plugins/org.mitk.example.gui.customviewer/src/internal/org_mitk_example_gui_customviewer_Activator.h @@ -1,44 +1,47 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #ifndef org_mitk_example_gui_customviewer_Activator_H #define org_mitk_example_gui_customviewer_Activator_H #include class ctkPluginContext; // //! [PluginActivatorHeader] class org_mitk_example_gui_customviewer_Activator : public QObject, public ctkPluginActivator { Q_OBJECT +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) + Q_PLUGIN_METADATA(IID "org_mitk_example_gui_customviewer") +#endif Q_INTERFACES(ctkPluginActivator) public: void start(ctkPluginContext* context); void stop(ctkPluginContext* context); static ctkPluginContext* GetPluginContext(); private: static ctkPluginContext* PluginContext; }; // //! [PluginActivatorHeader] #endif // org_mitk_example_gui_customviewer_Activator_H diff --git a/Examples/Plugins/org.mitk.example.gui.extensionpointcontribution/src/internal/org_mitk_example_gui_extensionpointcontribution_Activator.cpp b/Examples/Plugins/org.mitk.example.gui.extensionpointcontribution/src/internal/org_mitk_example_gui_extensionpointcontribution_Activator.cpp index e44ad74007..1c8b726083 100644 --- a/Examples/Plugins/org.mitk.example.gui.extensionpointcontribution/src/internal/org_mitk_example_gui_extensionpointcontribution_Activator.cpp +++ b/Examples/Plugins/org.mitk.example.gui.extensionpointcontribution/src/internal/org_mitk_example_gui_extensionpointcontribution_Activator.cpp @@ -1,35 +1,38 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #include "org_mitk_example_gui_extensionpointcontribution_Activator.h" #include "ChangeTextToLowerCase.h" #include "ChangeTextToUpperCase.h" #include void org_mitk_example_gui_extensionpointcontribution_Activator::start(ctkPluginContext* context) { BERRY_REGISTER_EXTENSION_CLASS(ChangeTextToLowerCase, context) BERRY_REGISTER_EXTENSION_CLASS(ChangeTextToUpperCase, context) } void org_mitk_example_gui_extensionpointcontribution_Activator::stop(ctkPluginContext* context) { Q_UNUSED(context) } -Q_EXPORT_PLUGIN2(org_mitk_example_gui_extensionpointcontribution, org_mitk_example_gui_extensionpointcontribution_Activator) +#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) + Q_EXPORT_PLUGIN2(org_mitk_example_gui_extensionpointcontribution, org_mitk_example_gui_extensionpointcontribution_Activator) +#endif + diff --git a/Examples/Plugins/org.mitk.example.gui.extensionpointcontribution/src/internal/org_mitk_example_gui_extensionpointcontribution_Activator.h b/Examples/Plugins/org.mitk.example.gui.extensionpointcontribution/src/internal/org_mitk_example_gui_extensionpointcontribution_Activator.h index 6cd46f0ada..263fb1264b 100644 --- a/Examples/Plugins/org.mitk.example.gui.extensionpointcontribution/src/internal/org_mitk_example_gui_extensionpointcontribution_Activator.h +++ b/Examples/Plugins/org.mitk.example.gui.extensionpointcontribution/src/internal/org_mitk_example_gui_extensionpointcontribution_Activator.h @@ -1,36 +1,39 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #ifndef org_mitk_example_gui_extensionpointcontribution_Activator_H #define org_mitk_example_gui_extensionpointcontribution_Activator_H #include class org_mitk_example_gui_extensionpointcontribution_Activator : public QObject, public ctkPluginActivator { Q_OBJECT +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) + Q_PLUGIN_METADATA(IID "org_mitk_example_gui_extensionpointcontribution") +#endif Q_INTERFACES(ctkPluginActivator) public: void start(ctkPluginContext* context); void stop(ctkPluginContext* context); }; #endif // org_mitk_example_gui_extensionpointcontribution_Activator_H diff --git a/Examples/Plugins/org.mitk.example.gui.extensionpointdefinition/src/internal/org_mitk_example_gui_extensionpointdefinition_Activator.cpp b/Examples/Plugins/org.mitk.example.gui.extensionpointdefinition/src/internal/org_mitk_example_gui_extensionpointdefinition_Activator.cpp index f9edf73097..b28cd9175a 100644 --- a/Examples/Plugins/org.mitk.example.gui.extensionpointdefinition/src/internal/org_mitk_example_gui_extensionpointdefinition_Activator.cpp +++ b/Examples/Plugins/org.mitk.example.gui.extensionpointdefinition/src/internal/org_mitk_example_gui_extensionpointdefinition_Activator.cpp @@ -1,44 +1,46 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #include "org_mitk_example_gui_extensionpointdefinition_Activator.h" #include "ExtensionPointDefinition.h" #include "MinimalPerspective.h" #include "MinimalView.h" #include void org_mitk_example_gui_extensionpointdefinition_Activator::start(ctkPluginContext* context) { BERRY_REGISTER_EXTENSION_CLASS(ExtensionPointDefinition, context) BERRY_REGISTER_EXTENSION_CLASS(MinimalPerspective, context) BERRY_REGISTER_EXTENSION_CLASS(MinimalView, context) } void org_mitk_example_gui_extensionpointdefinition_Activator::stop(ctkPluginContext* context) { Q_UNUSED(context) } ChangeTextRegistry* org_mitk_example_gui_extensionpointdefinition_Activator::getChangeTextRegistry() { static ChangeTextRegistry registry; return ®istry; } -Q_EXPORT_PLUGIN2(org_mitk_example_gui_extensionpointdefinition, org_mitk_example_gui_extensionpointdefinition_Activator) +#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) + Q_EXPORT_PLUGIN2(org_mitk_example_gui_extensionpointdefinition, org_mitk_example_gui_extensionpointdefinition_Activator) +#endif diff --git a/Examples/Plugins/org.mitk.example.gui.extensionpointdefinition/src/internal/org_mitk_example_gui_extensionpointdefinition_Activator.h b/Examples/Plugins/org.mitk.example.gui.extensionpointdefinition/src/internal/org_mitk_example_gui_extensionpointdefinition_Activator.h index 52a9660365..0cf1942db2 100644 --- a/Examples/Plugins/org.mitk.example.gui.extensionpointdefinition/src/internal/org_mitk_example_gui_extensionpointdefinition_Activator.h +++ b/Examples/Plugins/org.mitk.example.gui.extensionpointdefinition/src/internal/org_mitk_example_gui_extensionpointdefinition_Activator.h @@ -1,43 +1,46 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #ifndef org_mitk_example_gui_extensionpointdefinition_Activator_H #define org_mitk_example_gui_extensionpointdefinition_Activator_H #include #include "ChangeTextRegistry.h" class org_mitk_example_gui_extensionpointdefinition_Activator : public QObject, public ctkPluginActivator { Q_OBJECT +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) + Q_PLUGIN_METADATA(IID "org_mitk_example_gui_extensionpointdefinition") +#endif Q_INTERFACES(ctkPluginActivator) public: void start(ctkPluginContext* context); void stop(ctkPluginContext* context); /** * Get the Registry (for extensions). */ static ChangeTextRegistry* getChangeTextRegistry(); }; #endif // org_mitk_example_gui_extensionpointdefinition_Activator_H diff --git a/Examples/Plugins/org.mitk.example.gui.imaging/src/internal/mitkPluginActivator.cpp b/Examples/Plugins/org.mitk.example.gui.imaging/src/internal/mitkPluginActivator.cpp index 7c4b40697a..42c32ff086 100644 --- a/Examples/Plugins/org.mitk.example.gui.imaging/src/internal/mitkPluginActivator.cpp +++ b/Examples/Plugins/org.mitk.example.gui.imaging/src/internal/mitkPluginActivator.cpp @@ -1,50 +1,52 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #include "mitkPluginActivator.h" #include #include "src/internal/colourimageprocessing/QmitkColourImageProcessingView.h" #include "src/internal/isosurface/QmitkIsoSurface.h" #include "src/internal/simpleexample/QmitkSimpleExampleView.h" #include "src/internal/simplemeasurement/QmitkSimpleMeasurement.h" #include "src/internal/viewinitialization/QmitkViewInitializationView.h" #include "src/internal/volumetry/QmitkVolumetryView.h" #include "src/internal/surfaceutilities/QmitkSurfaceUtilities.h" namespace mitk { void PluginActivator::start(ctkPluginContext* context) { BERRY_REGISTER_EXTENSION_CLASS(QmitkColourImageProcessingView, context) BERRY_REGISTER_EXTENSION_CLASS(QmitkIsoSurface, context) BERRY_REGISTER_EXTENSION_CLASS(QmitkSimpleExampleView, context) BERRY_REGISTER_EXTENSION_CLASS(QmitkSimpleMeasurement, context) BERRY_REGISTER_EXTENSION_CLASS(QmitkViewInitializationView, context) BERRY_REGISTER_EXTENSION_CLASS(QmitkVolumetryView, context) BERRY_REGISTER_EXTENSION_CLASS(QmitkSurfaceUtilities, context) } void PluginActivator::stop(ctkPluginContext* context) { Q_UNUSED(context) } } -Q_EXPORT_PLUGIN2(org_mitk_gui_qt_examples, mitk::PluginActivator) +#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) + Q_EXPORT_PLUGIN2(org_mitk_gui_qt_examples, mitk::PluginActivator) +#endif diff --git a/Examples/Plugins/org.mitk.example.gui.imaging/src/internal/mitkPluginActivator.h b/Examples/Plugins/org.mitk.example.gui.imaging/src/internal/mitkPluginActivator.h index 489bd853ca..5dd5940465 100644 --- a/Examples/Plugins/org.mitk.example.gui.imaging/src/internal/mitkPluginActivator.h +++ b/Examples/Plugins/org.mitk.example.gui.imaging/src/internal/mitkPluginActivator.h @@ -1,40 +1,43 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #ifndef MITKPLUGINACTIVATOR_H #define MITKPLUGINACTIVATOR_H #include #include namespace mitk { class MITK_LOCAL PluginActivator : public QObject, public ctkPluginActivator { Q_OBJECT +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) + Q_PLUGIN_METADATA(IID "org_mitk_gui_qt_examples") +#endif Q_INTERFACES(ctkPluginActivator) public: void start(ctkPluginContext* context); void stop(ctkPluginContext* context); }; // PluginActivator } #endif // MITKPLUGINACTIVATOR_H diff --git a/Examples/Plugins/org.mitk.example.gui.minimalapplication/src/internal/org_mitk_example_gui_minimalapplication_Activator.cpp b/Examples/Plugins/org.mitk.example.gui.minimalapplication/src/internal/org_mitk_example_gui_minimalapplication_Activator.cpp index 1ffd94fc04..016215472c 100644 --- a/Examples/Plugins/org.mitk.example.gui.minimalapplication/src/internal/org_mitk_example_gui_minimalapplication_Activator.cpp +++ b/Examples/Plugins/org.mitk.example.gui.minimalapplication/src/internal/org_mitk_example_gui_minimalapplication_Activator.cpp @@ -1,36 +1,38 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #include "org_mitk_example_gui_minimalapplication_Activator.h" #include "MinimalApplication.h" #include "MinimalPerspective.h" #include void org_mitk_example_gui_minimalapplication_Activator::start(ctkPluginContext* context) { BERRY_REGISTER_EXTENSION_CLASS(MinimalApplication, context) BERRY_REGISTER_EXTENSION_CLASS(MinimalPerspective, context) } void org_mitk_example_gui_minimalapplication_Activator::stop(ctkPluginContext* context) { Q_UNUSED(context) } -Q_EXPORT_PLUGIN2(org_mitk_example_gui_minimalapplication, org_mitk_example_gui_minimalapplication_Activator) +#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) + Q_EXPORT_PLUGIN2(org_mitk_example_gui_minimalapplication, org_mitk_example_gui_minimalapplication_Activator) +#endif diff --git a/Examples/Plugins/org.mitk.example.gui.minimalapplication/src/internal/org_mitk_example_gui_minimalapplication_Activator.h b/Examples/Plugins/org.mitk.example.gui.minimalapplication/src/internal/org_mitk_example_gui_minimalapplication_Activator.h index d1e5c6ce75..4ce677fcd2 100644 --- a/Examples/Plugins/org.mitk.example.gui.minimalapplication/src/internal/org_mitk_example_gui_minimalapplication_Activator.h +++ b/Examples/Plugins/org.mitk.example.gui.minimalapplication/src/internal/org_mitk_example_gui_minimalapplication_Activator.h @@ -1,36 +1,39 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #ifndef org_mitk_example_gui_minimalapplication_Activator_H #define org_mitk_example_gui_minimalapplication_Activator_H #include class org_mitk_example_gui_minimalapplication_Activator : public QObject, public ctkPluginActivator { Q_OBJECT +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) + Q_PLUGIN_METADATA(IID "org_mitk_example_gui_minimalapplication") +#endif Q_INTERFACES(ctkPluginActivator) public: void start(ctkPluginContext* context); void stop(ctkPluginContext* context); }; #endif // org_mitk_example_gui_minimalapplication_Activator_H diff --git a/Examples/Plugins/org.mitk.example.gui.multipleperspectives/src/internal/org_mitk_example_gui_multipleperspectives_Activator.cpp b/Examples/Plugins/org.mitk.example.gui.multipleperspectives/src/internal/org_mitk_example_gui_multipleperspectives_Activator.cpp index a071e49572..a1b6e034ff 100644 --- a/Examples/Plugins/org.mitk.example.gui.multipleperspectives/src/internal/org_mitk_example_gui_multipleperspectives_Activator.cpp +++ b/Examples/Plugins/org.mitk.example.gui.multipleperspectives/src/internal/org_mitk_example_gui_multipleperspectives_Activator.cpp @@ -1,42 +1,44 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #include "org_mitk_example_gui_multipleperspectives_Activator.h" #include "MultiplePerspectives.h" #include "MinimalPerspective.h" #include "ExtendedPerspective.h" #include "EmptyView1.h" #include "EmptyView2.h" #include void org_mitk_example_gui_multipleperspectives_Activator::start(ctkPluginContext* context) { BERRY_REGISTER_EXTENSION_CLASS(MultiplePerspectives, context) BERRY_REGISTER_EXTENSION_CLASS(MinimalPerspective, context) BERRY_REGISTER_EXTENSION_CLASS(ExtendedPerspective, context) BERRY_REGISTER_EXTENSION_CLASS(EmptyView1, context) BERRY_REGISTER_EXTENSION_CLASS(EmptyView2, context) } void org_mitk_example_gui_multipleperspectives_Activator::stop(ctkPluginContext* context) { Q_UNUSED(context) } -Q_EXPORT_PLUGIN2(org_mitk_example_gui_multipleperspectives, org_mitk_example_gui_multipleperspectives_Activator) +#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) + Q_EXPORT_PLUGIN2(org_mitk_example_gui_multipleperspectives, org_mitk_example_gui_multipleperspectives_Activator) +#endif diff --git a/Examples/Plugins/org.mitk.example.gui.multipleperspectives/src/internal/org_mitk_example_gui_multipleperspectives_Activator.h b/Examples/Plugins/org.mitk.example.gui.multipleperspectives/src/internal/org_mitk_example_gui_multipleperspectives_Activator.h index ed1f4df078..7ee1d5272b 100644 --- a/Examples/Plugins/org.mitk.example.gui.multipleperspectives/src/internal/org_mitk_example_gui_multipleperspectives_Activator.h +++ b/Examples/Plugins/org.mitk.example.gui.multipleperspectives/src/internal/org_mitk_example_gui_multipleperspectives_Activator.h @@ -1,36 +1,39 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #ifndef org_mitk_example_gui_multipleperspectives_Activator_H #define org_mitk_example_gui_multipleperspectives_Activator_H #include class org_mitk_example_gui_multipleperspectives_Activator : public QObject, public ctkPluginActivator { Q_OBJECT +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) + Q_PLUGIN_METADATA(IID "org_mitk_example_gui_multipleperspectives") +#endif Q_INTERFACES(ctkPluginActivator) public: void start(ctkPluginContext* context); void stop(ctkPluginContext* context); }; #endif // org_mitk_example_gui_multipleperspectives_Activator_H diff --git a/Examples/Plugins/org.mitk.example.gui.opencv/src/internal/mitkPluginActivator.cpp b/Examples/Plugins/org.mitk.example.gui.opencv/src/internal/mitkPluginActivator.cpp index 86724180cb..bb64d5ec02 100644 --- a/Examples/Plugins/org.mitk.example.gui.opencv/src/internal/mitkPluginActivator.cpp +++ b/Examples/Plugins/org.mitk.example.gui.opencv/src/internal/mitkPluginActivator.cpp @@ -1,36 +1,38 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #include "mitkPluginActivator.h" #include "src/internal/videoplayer/QmitkVideoPlayer.h" #include namespace mitk { void PluginActivator::start(ctkPluginContext* context) { BERRY_REGISTER_EXTENSION_CLASS(QmitkVideoPlayer, context) } void PluginActivator::stop(ctkPluginContext* context) { Q_UNUSED(context) } } -Q_EXPORT_PLUGIN2(org_mitk_gui_qt_examplesopencv, mitk::PluginActivator) +#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) + Q_EXPORT_PLUGIN2(org_mitk_gui_qt_examplesopencv, mitk::PluginActivator) +#endif diff --git a/Examples/Plugins/org.mitk.example.gui.opencv/src/internal/mitkPluginActivator.h b/Examples/Plugins/org.mitk.example.gui.opencv/src/internal/mitkPluginActivator.h index b96fd0fb6e..bb961625ce 100644 --- a/Examples/Plugins/org.mitk.example.gui.opencv/src/internal/mitkPluginActivator.h +++ b/Examples/Plugins/org.mitk.example.gui.opencv/src/internal/mitkPluginActivator.h @@ -1,40 +1,43 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #ifndef MITKPLUGINACTIVATOR_H #define MITKPLUGINACTIVATOR_H #include #include namespace mitk { class MITK_LOCAL PluginActivator : public QObject, public ctkPluginActivator { Q_OBJECT - Q_INTERFACES(ctkPluginActivator) +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) + Q_PLUGIN_METADATA(IID "org_mitk_gui_qt_examplesopencv") +#endif + Q_INTERFACES(ctkPluginActivator) public: void start(ctkPluginContext* context); void stop(ctkPluginContext* context); }; // PluginActivator } #endif // MITKPLUGINACTIVATOR_H diff --git a/Examples/Plugins/org.mitk.example.gui.regiongrowing/src/internal/org_mitk_example_gui_regiongrowing_Activator.cpp b/Examples/Plugins/org.mitk.example.gui.regiongrowing/src/internal/org_mitk_example_gui_regiongrowing_Activator.cpp index a0d3863e2e..d7bd9aae63 100644 --- a/Examples/Plugins/org.mitk.example.gui.regiongrowing/src/internal/org_mitk_example_gui_regiongrowing_Activator.cpp +++ b/Examples/Plugins/org.mitk.example.gui.regiongrowing/src/internal/org_mitk_example_gui_regiongrowing_Activator.cpp @@ -1,38 +1,40 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #include "org_mitk_example_gui_regiongrowing_Activator.h" #include #include "QmitkRegionGrowingView.h" namespace mitk { void org_mitk_example_gui_regiongrowing_Activator::start(ctkPluginContext* context) { BERRY_REGISTER_EXTENSION_CLASS(QmitkRegionGrowingView, context) } void org_mitk_example_gui_regiongrowing_Activator::stop(ctkPluginContext* context) { Q_UNUSED(context) } } -Q_EXPORT_PLUGIN2(org_mitk_example_gui_regiongrowing, mitk::org_mitk_example_gui_regiongrowing_Activator) +#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) + Q_EXPORT_PLUGIN2(org_mitk_example_gui_regiongrowing, mitk::org_mitk_example_gui_regiongrowing_Activator) +#endif diff --git a/Examples/Plugins/org.mitk.example.gui.regiongrowing/src/internal/org_mitk_example_gui_regiongrowing_Activator.h b/Examples/Plugins/org.mitk.example.gui.regiongrowing/src/internal/org_mitk_example_gui_regiongrowing_Activator.h index 29d561d6f5..37f5aeef32 100644 --- a/Examples/Plugins/org.mitk.example.gui.regiongrowing/src/internal/org_mitk_example_gui_regiongrowing_Activator.h +++ b/Examples/Plugins/org.mitk.example.gui.regiongrowing/src/internal/org_mitk_example_gui_regiongrowing_Activator.h @@ -1,40 +1,43 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #ifndef org_mitk_example_gui_regiongrowing_Activator_h #define org_mitk_example_gui_regiongrowing_Activator_h #include namespace mitk { class org_mitk_example_gui_regiongrowing_Activator : public QObject, public ctkPluginActivator { Q_OBJECT +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) + Q_PLUGIN_METADATA(IID "org_mitk_example_gui_regiongrowing") +#endif Q_INTERFACES(ctkPluginActivator) public: void start(ctkPluginContext* context); void stop(ctkPluginContext* context); }; // org_mitk_example_gui_regiongrowing_Activator } #endif // org_mitk_example_gui_regiongrowing_Activator_h diff --git a/Examples/Plugins/org.mitk.example.gui.selectionservicemitk.views/src/internal/org_mitk_example_gui_selectionservicemitk_views_Activator.cpp b/Examples/Plugins/org.mitk.example.gui.selectionservicemitk.views/src/internal/org_mitk_example_gui_selectionservicemitk_views_Activator.cpp index 6dbb8b0ae1..65547f0103 100644 --- a/Examples/Plugins/org.mitk.example.gui.selectionservicemitk.views/src/internal/org_mitk_example_gui_selectionservicemitk_views_Activator.cpp +++ b/Examples/Plugins/org.mitk.example.gui.selectionservicemitk.views/src/internal/org_mitk_example_gui_selectionservicemitk_views_Activator.cpp @@ -1,38 +1,40 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #include "org_mitk_example_gui_selectionservicemitk_views_Activator.h" #include "ListenerViewMitk.h" #include "SelectionViewMitk.h" #include void org_mitk_example_gui_selectionservicemitk_views_Activator::start(ctkPluginContext* context) { BERRY_REGISTER_EXTENSION_CLASS(ListenerViewMitk, context) BERRY_REGISTER_EXTENSION_CLASS(SelectionViewMitk, context) } void org_mitk_example_gui_selectionservicemitk_views_Activator::stop(ctkPluginContext* context) { Q_UNUSED(context) } -Q_EXPORT_PLUGIN2(org_mitk_example_gui_selectionservicemitk_views, org_mitk_example_gui_selectionservicemitk_views_Activator) +#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) + Q_EXPORT_PLUGIN2(org_mitk_example_gui_selectionservicemitk_views, org_mitk_example_gui_selectionservicemitk_views_Activator) +#endif diff --git a/Examples/Plugins/org.mitk.example.gui.selectionservicemitk.views/src/internal/org_mitk_example_gui_selectionservicemitk_views_Activator.h b/Examples/Plugins/org.mitk.example.gui.selectionservicemitk.views/src/internal/org_mitk_example_gui_selectionservicemitk_views_Activator.h index fc8d45039c..ad4f34297b 100644 --- a/Examples/Plugins/org.mitk.example.gui.selectionservicemitk.views/src/internal/org_mitk_example_gui_selectionservicemitk_views_Activator.h +++ b/Examples/Plugins/org.mitk.example.gui.selectionservicemitk.views/src/internal/org_mitk_example_gui_selectionservicemitk_views_Activator.h @@ -1,36 +1,39 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #ifndef org_mitk_example_gui_selectionservicemitk_views_Activator_H #define org_mitk_example_gui_selectionservicemitk_views_Activator_H #include class org_mitk_example_gui_selectionservicemitk_views_Activator : public QObject, public ctkPluginActivator { Q_OBJECT +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) + Q_PLUGIN_METADATA(IID "org_mitk_example_gui_selectionservicemitk_views") +#endif Q_INTERFACES(ctkPluginActivator) public: void start(ctkPluginContext* context); void stop(ctkPluginContext* context); }; #endif // org_mitk_example_gui_selectionservicemitk_views_Activator_H diff --git a/Examples/Plugins/org.mitk.example.gui.selectionservicemitk/src/internal/org_mitk_example_gui_selectionservicemitk_Activator.cpp b/Examples/Plugins/org.mitk.example.gui.selectionservicemitk/src/internal/org_mitk_example_gui_selectionservicemitk_Activator.cpp index dd9ce20696..1c25e30bce 100644 --- a/Examples/Plugins/org.mitk.example.gui.selectionservicemitk/src/internal/org_mitk_example_gui_selectionservicemitk_Activator.cpp +++ b/Examples/Plugins/org.mitk.example.gui.selectionservicemitk/src/internal/org_mitk_example_gui_selectionservicemitk_Activator.cpp @@ -1,38 +1,40 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #include "org_mitk_example_gui_selectionservicemitk_Activator.h" #include "SelectionServiceMitk.h" #include "ExtendedPerspective.h" #include void org_mitk_example_gui_selectionservicemitk_Activator::start(ctkPluginContext* context) { BERRY_REGISTER_EXTENSION_CLASS(SelectionServiceMitk, context) BERRY_REGISTER_EXTENSION_CLASS(ExtendedPerspective, context) } void org_mitk_example_gui_selectionservicemitk_Activator::stop(ctkPluginContext* context) { Q_UNUSED(context) } -Q_EXPORT_PLUGIN2(org_mitk_example_gui_selectionservicemitk, org_mitk_example_gui_selectionservicemitk_Activator) +#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) + Q_EXPORT_PLUGIN2(org_mitk_example_gui_selectionservicemitk, org_mitk_example_gui_selectionservicemitk_Activator) +#endif diff --git a/Examples/Plugins/org.mitk.example.gui.selectionservicemitk/src/internal/org_mitk_example_gui_selectionservicemitk_Activator.h b/Examples/Plugins/org.mitk.example.gui.selectionservicemitk/src/internal/org_mitk_example_gui_selectionservicemitk_Activator.h index e1f807d2ee..eeea2518ca 100644 --- a/Examples/Plugins/org.mitk.example.gui.selectionservicemitk/src/internal/org_mitk_example_gui_selectionservicemitk_Activator.h +++ b/Examples/Plugins/org.mitk.example.gui.selectionservicemitk/src/internal/org_mitk_example_gui_selectionservicemitk_Activator.h @@ -1,36 +1,39 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #ifndef org_mitk_example_gui_selectionservicemitk_Activator_H #define org_mitk_example_gui_selectionservicemitk_Activator_H #include class org_mitk_example_gui_selectionservicemitk_Activator : public QObject, public ctkPluginActivator { Q_OBJECT +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) + Q_PLUGIN_METADATA(IID "org_mitk_example_gui_selectionservicemitk") +#endif Q_INTERFACES(ctkPluginActivator) public: void start(ctkPluginContext* context); void stop(ctkPluginContext* context); }; #endif // org_mitk_example_gui_selectionservicemitk_Activator_H diff --git a/Examples/Plugins/org.mitk.example.gui.selectionserviceqt/src/internal/org_mitk_example_gui_selectionserviceqt_Activator.cpp b/Examples/Plugins/org.mitk.example.gui.selectionserviceqt/src/internal/org_mitk_example_gui_selectionserviceqt_Activator.cpp index 440edb3ab4..33ac2db633 100644 --- a/Examples/Plugins/org.mitk.example.gui.selectionserviceqt/src/internal/org_mitk_example_gui_selectionserviceqt_Activator.cpp +++ b/Examples/Plugins/org.mitk.example.gui.selectionserviceqt/src/internal/org_mitk_example_gui_selectionserviceqt_Activator.cpp @@ -1,41 +1,43 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #include "org_mitk_example_gui_selectionserviceqt_Activator.h" #include "SelectionServiceQt.h" #include "ExtendedPerspective.h" #include "ListenerView.h" #include "SelectionView.h" #include void org_mitk_example_gui_selectionserviceqt_Activator::start(ctkPluginContext* context) { BERRY_REGISTER_EXTENSION_CLASS(SelectionServiceQt, context) BERRY_REGISTER_EXTENSION_CLASS(ExtendedPerspective, context) BERRY_REGISTER_EXTENSION_CLASS(ListenerView, context) BERRY_REGISTER_EXTENSION_CLASS(SelectionView, context) } void org_mitk_example_gui_selectionserviceqt_Activator::stop(ctkPluginContext* context) { Q_UNUSED(context) } -Q_EXPORT_PLUGIN2(org_mitk_example_gui_selectionserviceqt, org_mitk_example_gui_selectionserviceqt_Activator) +#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) + Q_EXPORT_PLUGIN2(org_mitk_example_gui_selectionserviceqt, org_mitk_example_gui_selectionserviceqt_Activator) +#endif diff --git a/Examples/Plugins/org.mitk.example.gui.selectionserviceqt/src/internal/org_mitk_example_gui_selectionserviceqt_Activator.h b/Examples/Plugins/org.mitk.example.gui.selectionserviceqt/src/internal/org_mitk_example_gui_selectionserviceqt_Activator.h index 63661b8979..a4a00cf7cb 100644 --- a/Examples/Plugins/org.mitk.example.gui.selectionserviceqt/src/internal/org_mitk_example_gui_selectionserviceqt_Activator.h +++ b/Examples/Plugins/org.mitk.example.gui.selectionserviceqt/src/internal/org_mitk_example_gui_selectionserviceqt_Activator.h @@ -1,36 +1,39 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #ifndef org_mitk_example_gui_selectionserviceqt_Activator_H #define org_mitk_example_gui_selectionserviceqt_Activator_H #include class org_mitk_example_gui_selectionserviceqt_Activator : public QObject, public ctkPluginActivator { Q_OBJECT +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) + Q_PLUGIN_METADATA(IID "org_mitk_example_gui_selectionserviceqt") +#endif Q_INTERFACES(ctkPluginActivator) public: void start(ctkPluginContext* context); void stop(ctkPluginContext* context); }; #endif // org_mitk_example_gui_selectionserviceqt_Activator_H diff --git a/Examples/QuickRender/CMakeLists.txt b/Examples/QuickRender/CMakeLists.txt index 0bc5f675a0..ab2111efc6 100644 --- a/Examples/QuickRender/CMakeLists.txt +++ b/Examples/QuickRender/CMakeLists.txt @@ -1,4 +1,4 @@ project(QuickRender) find_package(MITK REQUIRED) -mitk_create_executable(DEPENDS MitkQmlItems) +mitk_create_executable(DEPENDS MitkQmlItems MitkLegacyIO)