Removed QtMobility stuff.

CMake/CTestCustom.cmake.in

@@ -83,6 +83,6 @@ SET(CTEST_CUSTOM_WARNING_EXCEPTION
   # Visual studio spurious warnings...
   "The following environment variables were not found"
   
-  # QtMobility 
+  # External projects not using $(MAKE) properly 
   "warning: jobserver unavailable: using -j1.  Add `+' to parent make rule."
   )

CMakeExternals/QtMobility.cmake

@@ -1,115 +0,0 @@
-#
-# QtMobility
-#
-SET(QtMobility_DEPENDS)
-ctkMacroShouldAddExternalProject(QtMobility_LIBRARIES add_project)
-IF(${add_project})
-  SET(QtMobility_enabling_variable QtMobility_LIBRARIES)
-  SET(proj QtMobility)
-#   MESSAGE(STATUS "Adding project:${proj}")
-  SET(QtMobility_DEPENDS ${proj})
-
-  IF(NOT DEFINED QtMobility_DIR)
-    # Patch program
-    FIND_PROGRAM(CTK_PATCH_EXECUTABLE patch
-      "C:/Program Files/GnuWin32/bin"
-      "C:/Program Files (x86)/GnuWin32/bin")
-    MARK_AS_ADVANCED(CTK_PATCH_EXECUTABLE)
-    IF(NOT CTK_PATCH_EXECUTABLE)
-      MESSAGE(FATAL_ERROR "error: Patch is required to build ${proj}. Set CTK_PATCH_EXECUTABLE. If running Windows, you can download it here: http://gnuwin32.sourceforge.net/packages/patch.htm")
-    ENDIF()
-
-    # Configure patch script
-    SET(qtmobility_src_dir ${CMAKE_BINARY_DIR}/${proj})
-    SET(qtmobility_patch_dir ${CTK_SOURCE_DIR}/Utilities/QtMobility/)
-    SET(qtmobility_configured_patch_dir ${CTK_BINARY_DIR}/Utilities/QtMobility/)
-    SET(qtmobility_patchscript
-      ${qtmobility_configured_patch_dir}/QtMobility-1.0.0-patch.cmake)
-    CONFIGURE_FILE(
-      ${qtmobility_patch_dir}/QtMobility-1.0.0-patch.cmake.in
-      ${qtmobility_patchscript} @ONLY)
-
-    # Define configure options
-    SET(qtmobility_modules "serviceframework")
-    SET(qtmobility_build_type "release")
-    IF(UNIX OR MINGW)
-      IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
-        SET(qtmobility_build_type "debug")
-      ENDIF()
-    ELSEIF(NOT ${CMAKE_CFG_INTDIR} STREQUAL "Release")
-      SET(qtmobility_build_type "debug")
-    ENDIf()
-
-    SET(qtmobility_make_cmd)
-    SET(qtmobility_install_cmd)
-    SET(qtmobility_config_in "${qtmobility_patch_dir}/QtMobilityConfig.cmake.in")
-    SET(qtmobility_config_out "${qtmobility_configured_patch_dir}/QtMobilityConfig.cmake")
-
-    IF(UNIX)
-      SET(qtmobility_make_cmd make)
-      SET(qtmobility_config_args -${qtmobility_build_type} -libdir ${CTK_CMAKE_LIBRARY_OUTPUT_DIRECTORY} -no-docs -modules ${qtmobility_modules})
-      SET(qtmobility_install_cmd ${qtmobility_make_cmd} install)
-
-      SET(QTMOBILITY_QTSERVICEFW_INCLUDE_DIR
-          "${CTK_BINARY_DIR}/QtMobility/install/include")
-      SET(QTMOBILITY_QTSERVICEFW_LIBRARY_DEBUG
-          "${CTK_CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libQtServiceFrameworkd.so")
-      SET(QTMOBILITY_QTSERVICEFW_LIBRARY_RELEASE
-          "${CTK_CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libQtServiceFramework.so")
-
-      IF(APPLE)
-        CONFIGURE_FILE(${qtmobility_patch_dir}/QtMobility-1.0.0-make-apple.cmake.in
-                     ${qtmobility_configured_patch_dir}/QtMobility-1.0.0-make-apple.cmake @ONLY)
-        SET(qtmobility_make_cmd ${CMAKE_COMMAND} -P ${qtmobility_configured_patch_dir}/QtMobility-1.0.0-make-apple.cmake)
-      ENDIF()
-
-      CONFIGURE_FILE("${qtmobility_config_in}" "${qtmobility_config_out}" @ONLY)
-    ELSEIF(WIN32)
-      SET(qtmobility_make_cmd nmake)
-      SET(qtmobility_servicefw_libname_debug QtServiceFrameworkd.lib)
-      SET(qtmobility_servicefw_libname_release QtServiceFramework.lib)
-      IF(MINGW AND NOT MSYS)
-        SET(qtmobility_make_cmd mingw32-make)
-        SET(qtmobility_servicefw_libname_debug libQtServiceFrameworkd.a)
-        SET(qtmobility_servicefw_libname_release libQtServiceFramework.a)
-      ENDIF()
-
-      SET(qtmobility_win32_install_prefix "${CTK_BINARY_DIR}/${proj}/install/")
-      STRING(REPLACE "/" "\\" qtmobility_win32_native_install_prefix ${qtmobility_win32_install_prefix})
-
-      SET(qtmobility_config_args -${qtmobility_build_type} -qt ${QT_BINARY_DIR} -prefix ${qtmobility_win32_native_install_prefix} -no-docs -modules ${qtmobility_modules})
-
-      CONFIGURE_FILE(${qtmobility_patch_dir}/QtMobility-1.0.0-install-win32.cmake.in
-                     ${qtmobility_configured_patch_dir}/QtMobility-1.0.0-install-win32.cmake @ONLY)
-
-      SET(qtmobility_install_cmd ${CMAKE_COMMAND} -D INTERMEDIATE_DIRECTORY:STRING=$(IntDir) -P ${qtmobility_configured_patch_dir}/QtMobility-1.0.0-install-win32.cmake)
-
-      # On Windows, the QtMobilityConfig.cmake file is written in the install script above
-    ENDIF()
-
-    ExternalProject_Add(${proj}
-      SOURCE_DIR ${CMAKE_BINARY_DIR}/${proj}
-      PREFIX ${proj}${ep_suffix}
-      URL ${CTK_SOURCE_DIR}/Utilities/QtMobility/qt-mobility-servicefw-opensource-src-1.0.0.tar.gz
-      PATCH_COMMAND ${CMAKE_COMMAND} -P ${qtmobility_patchscript}
-      CONFIGURE_COMMAND <SOURCE_DIR>/configure ${qtmobility_config_args}
-      BUILD_COMMAND ${qtmobility_make_cmd}
-      INSTALL_COMMAND ${qtmobility_install_cmd}
-      BUILD_IN_SOURCE 1
-      )
-
-    SET(QtMobility_DIR ${qtmobility_configured_patch_dir})
-
-  ELSE()
-    ctkMacroEmptyExternalProject(${proj} "${proj_DEPENDENCIES}")
-  ENDIF()
-
-  # Since the full path of QtMobility library is used, there is not need to add
-  # its corresponding library output directory to CTK_EXTERNAL_LIBRARY_DIRS
-
-  LIST(APPEND CTK_SUPERBUILD_EP_VARS QtMobility_DIR:PATH)
-
-  SET(${QtMobility_enabling_variable}_INCLUDE_DIRS QtMobility_INCLUDE_DIRS)
-  SET(${QtMobility_enabling_variable}_FIND_PACKAGE_CMD QtMobility)
-
-ENDIF()

CMakeLists.txt

@@ -381,7 +381,6 @@ SET(CTK_PLUGINS
   # Misc
   org.commontk.plugingenerator.core:OFF
   org.commontk.plugingenerator.ui:OFF
-  org.commontk.qtmobility.service:OFF
   org.commontk.slicermodule:OFF
   )
 

Plugins/org.commontk.qtmobility.service/CMakeLists.txt

@@ -1,30 +0,0 @@
-PROJECT(org_commontk_qtmobility_service)
-
-SET(PLUGIN_export_directive "org_commontk_qtmobsfw_EXPORT")
-
-SET(PLUGIN_SRCS
-  ctkQtMobilityServiceActivator.cpp
-  ctkQtMobilityServiceConstants.cpp
-  ctkQtMobilityServiceFactory.cpp
-  ctkQtMobilityServiceRuntime.cpp
-)
-
-SET(PLUGIN_MOC_SRCS
-  ctkQtMobilityServiceActivator_p.h
-  ctkQtMobilityServiceFactory_p.h
-  ctkQtMobilityServiceRuntime_p.h
-)
-
-SET(PLUGIN_resources
-
-)
-
-ctkFunctionGetTargetLibraries(PLUGIN_target_libraries)
-
-ctkMacroBuildPlugin(
-  EXPORT_DIRECTIVE ${PLUGIN_export_directive}
-  SRCS ${PLUGIN_SRCS}
-  MOC_SRCS ${PLUGIN_MOC_SRCS}
-  RESOURCES ${PLUGIN_resources}
-  TARGET_LIBRARIES ${PLUGIN_target_libraries}
-)

Plugins/org.commontk.qtmobility.service/ctkQtMobilityServiceActivator.cpp

@@ -1,110 +0,0 @@
-/*=============================================================================
-
-  Library: CTK
-
-  Copyright (c) German Cancer Research Center,
-    Division of Medical and Biological Informatics
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-=============================================================================*/
-
-/*
- * ctkQtMobilityServiceActivator.cxx
- *
- *  Created on: Mar 29, 2010
- *      Author: zelzer
- */
-
-
-#include "ctkQtMobilityServiceActivator_p.h"
-#include "ctkQtMobilityServiceRuntime_p.h"
-
-#include <ctkServiceTracker.h>
-#include <ctkServiceException.h>
-#include <service/log/ctkLogService.h>
-
-#include <QtPlugin>
-
-ctkQtMobilityServiceActivator::LogTracker* ctkQtMobilityServiceActivator::logTracker = 0;
-
-void ctkQtMobilityServiceActivator::start(ctkPluginContext* context)
-{
-  logTracker = new LogTracker(context);
-  logTracker->open();
-  mobsr = new ctkQtMobilityServiceRuntime(context);
-  mobsr->start();
-}
-
-void ctkQtMobilityServiceActivator::stop(ctkPluginContext* context)
-{
-  Q_UNUSED(context)
-
-  if (mobsr)
-  {
-    mobsr->stop();
-    delete mobsr;
-    mobsr = 0;
-  }
-
-  if (logTracker)
-  {
-    logTracker->close();
-    delete logTracker;
-    logTracker = 0;
-  }
-}
-
-ctkLogService* ctkQtMobilityServiceActivator::getLogService()
-{
-  if (logTracker == 0)
-  {
-    return 0;
-  }
-
-  return logTracker->getService();
-}
-
-void ctkQtMobilityServiceActivator::logError(ctkPluginContext* pc, const QString& msg, std::exception* e)
-{
-  logPluginContext(pc, ctkLogService::LOG_ERROR, msg, e);
-}
-
-void ctkQtMobilityServiceActivator::logWarning(ctkPluginContext* pc, const QString& msg, std::exception* e)
-{
-  logPluginContext(pc, ctkLogService::LOG_WARNING, msg, e);
-}
-
-void ctkQtMobilityServiceActivator::logInfo(ctkPluginContext* pc, const QString& msg, std::exception* e)
-{
-  logPluginContext(pc, ctkLogService::LOG_INFO, msg, e);
-}
-
-void ctkQtMobilityServiceActivator::logPluginContext(ctkPluginContext* pc, int level, const QString& msg, const std::exception* e)
-{
-  try
-  {
-    ctkServiceReference sr = pc->getServiceReference("ctkLogService");
-    ctkLogService* log = qobject_cast<ctkLogService*>(pc->getService(sr));
-    if (log)
-    {
-      log->log(level, msg, e);
-      pc->ungetService(sr);
-    }
-  }
-  catch (const ctkServiceException&)
-  { }
-}
-
-
-Q_EXPORT_PLUGIN2(org_commontk_qtmobility_service, ctkQtMobilityServiceActivator)

Plugins/org.commontk.qtmobility.service/ctkQtMobilityServiceActivator_p.h

@@ -1,64 +0,0 @@
-/*=============================================================================
-
-  Library: CTK
-
-  Copyright (c) German Cancer Research Center,
-    Division of Medical and Biological Informatics
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-=============================================================================*/
-
-#ifndef CTKEVENTBUSPLUGIN_H
-#define CTKEVENTBUSPLUGIN_H
-
-#include <ctkPluginActivator.h>
-
-class QObject;
-
-struct ctkLogService;
-template<class S, class T> class ctkServiceTracker;
-class ctkQtMobilityServiceRuntime;
-
-class ctkQtMobilityServiceActivator : public QObject,
-                                      public ctkPluginActivator
-{
-  Q_OBJECT
-  Q_INTERFACES(ctkPluginActivator)
-
-public:
-
-  void start(ctkPluginContext* context);
-  void stop(ctkPluginContext* context);
-
-  static ctkLogService* getLogService();
-
-  static void logError(ctkPluginContext* pc, const QString& msg, std::exception* e = 0);
-  static void logWarning(ctkPluginContext* pc, const QString& msg, std::exception* e = 0);
-  static void logInfo(ctkPluginContext* pc, const QString& msg, std::exception* e = 0);
-
-
-private:
-
-  static void logPluginContext(ctkPluginContext* pc, int level, const QString& msg, const std::exception* e);
-
-  ctkQtMobilityServiceRuntime* mobsr;
-
-  typedef ctkServiceTracker<ctkLogService*,ctkLogService*> LogTracker;
-
-  static LogTracker* logTracker;
-
-};
-
-
-#endif // CTKEVENTBUSPLUGIN_H

Plugins/org.commontk.qtmobility.service/ctkQtMobilityServiceConstants.cpp

@@ -1,25 +0,0 @@
-/*=============================================================================
-
-  Library: CTK
-
-  Copyright (c) German Cancer Research Center,
-    Division of Medical and Biological Informatics
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-=============================================================================*/
-
-
-#include "ctkQtMobilityServiceConstants_p.h"
-
-const QString ctkQtMobilityServiceConstants::SERVICE_DESCRIPTOR = "QtMobility-ServiceDescriptor";

Plugins/org.commontk.qtmobility.service/ctkQtMobilityServiceConstants_p.h

@@ -1,44 +0,0 @@
-/*=============================================================================
-
-  Library: CTK
-
-  Copyright (c) German Cancer Research Center,
-    Division of Medical and Biological Informatics
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-=============================================================================*/
-
-
-#ifndef CTKQTMOBILITYSERVICECONSTANTS_P_H
-#define CTKQTMOBILITYSERVICECONSTANTS_P_H
-
-#include <QString>
-
-/**
- * Defines standard names for QtMobility Service constants.
- */
-struct ctkQtMobilityServiceConstants
-{
-
-  /**
-     * Manifest header specifying the XML document within a plugin that contains
-     * the plugin's QtMobility service descriptor.
-     * <p>
-     * The attribute value may be retrieved from the <code>ctkDictionary</code>
-     * object returned by the <code>ctkPlugin::getHeaders</code> method.
-     */
-  static const QString SERVICE_DESCRIPTOR; // = "Service-Descriptor";
-};
-
-#endif // CTKQTMOBILITYSERVICECONSTANTS_P_H

Plugins/org.commontk.qtmobility.service/ctkQtMobilityServiceFactory.cpp

@@ -1,82 +0,0 @@
-/*=============================================================================
-
-  Library: CTK
-
-  Copyright (c) German Cancer Research Center,
-    Division of Medical and Biological Informatics
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-=============================================================================*/
-
-
-#include "ctkQtMobilityServiceFactory_p.h"
-
-#include "ctkQtMobilityServiceRuntime_p.h"
-#include "ctkQtMobilityServiceActivator_p.h"
-
-#include <service/log/ctkLogService.h>
-
-#include <ctkPluginException.h>
-#include <ctkPluginConstants.h>
-
-#include <QBuffer>
-
-ctkQtMobilityServiceFactory::ctkQtMobilityServiceFactory(
-  const QServiceInterfaceDescriptor& descr,
-  ctkQtMobilityServiceRuntime* sr, QSharedPointer<ctkPlugin> p)
-  : activeCount(0), serviceDescriptor(descr), sr(sr), servicePlugin(p)
-{
-}
-
-QObject* ctkQtMobilityServiceFactory::getService(
-  QSharedPointer<ctkPlugin> usingPlugin, ctkServiceRegistration registration)
-{
-  Q_UNUSED(usingPlugin)
-  Q_UNUSED(registration)
-
-  CTK_DEBUG(ctkQtMobilityServiceActivator::getLogService())
-      << "QtMobSF::getService(), " << serviceDescriptor.serviceName() << " "
-      << serviceDescriptor.interfaceName() << serviceDescriptor.majorVersion()
-      << "." << serviceDescriptor.minorVersion() << ", active = " << activeCount;
-
-  if (servicePlugin->getState() != ctkPlugin::ACTIVE)
-  {
-    try
-    {
-      servicePlugin->start(0);
-    }
-    catch (const ctkPluginException* e)
-    {
-      CTK_ERROR_EXC(ctkQtMobilityServiceActivator::getLogService(), e)
-          << "Delayed plugin activation failed.";
-      return 0;
-    }
-  }
-  ++activeCount;
-  return sr->getQServiceManager().loadInterface(serviceDescriptor);
-}
-
-void ctkQtMobilityServiceFactory::ungetService(
-  QSharedPointer<ctkPlugin> usingPlugin, ctkServiceRegistration registration, QObject* service)
-{
-  Q_UNUSED(usingPlugin)
-  Q_UNUSED(registration)
-  Q_UNUSED(service)
-
-  CTK_DEBUG(ctkQtMobilityServiceActivator::getLogService())
-      << "QtMobSF::ungetService(), " << serviceDescriptor.serviceName() << " "
-      << serviceDescriptor.interfaceName() << serviceDescriptor.majorVersion()
-      << "." << serviceDescriptor.minorVersion() << ", active = " << activeCount;
-  --activeCount;
-}

Plugins/org.commontk.qtmobility.service/ctkQtMobilityServiceFactory_p.h

@@ -1,56 +0,0 @@
-/*=============================================================================
-
-  Library: CTK
-
-  Copyright (c) German Cancer Research Center,
-    Division of Medical and Biological Informatics
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-=============================================================================*/
-
-
-#ifndef CTKQTMOBILITYSERVICEFACTORY_P_H
-#define CTKQTMOBILITYSERVICEFACTORY_P_H
-
-#include <ctkServiceFactory.h>
-
-#include <QServiceInterfaceDescriptor>
-
-class ctkQtMobilityServiceRuntime;
-
-using namespace QtMobility;
-
-class ctkQtMobilityServiceFactory : public QObject, public ctkServiceFactory
-{
-  Q_OBJECT
-  Q_INTERFACES(ctkServiceFactory)
-
-public:
-
-  ctkQtMobilityServiceFactory(const QServiceInterfaceDescriptor& descr,
-                              ctkQtMobilityServiceRuntime* sr, QSharedPointer<ctkPlugin> plugin);
-
-  QObject* getService(QSharedPointer<ctkPlugin> usingPlugin, ctkServiceRegistration registration);
-  void ungetService(QSharedPointer<ctkPlugin> usingPlugin, ctkServiceRegistration registration, QObject* service);
-
-private:
-
-  int activeCount;
-
-  QServiceInterfaceDescriptor serviceDescriptor;
-  ctkQtMobilityServiceRuntime* sr;
-  QSharedPointer<ctkPlugin> servicePlugin;
-};
-
-#endif // CTKQTMOBILITYSERVICEFACTORY_P_H

Plugins/org.commontk.qtmobility.service/ctkQtMobilityServiceRuntime.cpp

@@ -1,233 +0,0 @@
-/*=============================================================================
-
-  Library: CTK
-
-  Copyright (c) German Cancer Research Center,
-    Division of Medical and Biological Informatics
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-=============================================================================*/
-
-
-#include "ctkQtMobilityServiceRuntime_p.h"
-
-#include "ctkQtMobilityServiceConstants_p.h"
-#include "ctkQtMobilityServiceActivator_p.h"
-#include "ctkQtMobilityServiceFactory_p.h"
-
-#include <ctkPluginContext.h>
-#include <ctkPlugin.h>
-#include <service/log/ctkLogService.h>
-#include <ctkPluginConstants.h>
-#include <ctkServiceRegistration.h>
-
-#include <QBuffer>
-
-ctkQtMobilityServiceRuntime::ctkQtMobilityServiceRuntime(ctkPluginContext* pc)
-  : pc(pc)
-{
-}
-
-void ctkQtMobilityServiceRuntime::start()
-{
-  pc->connectPluginListener(this, SLOT(pluginChanged(ctkPluginEvent)), Qt::DirectConnection);
-  QList<QSharedPointer<ctkPlugin> > plugins = pc->getPlugins();
-  foreach(QSharedPointer<ctkPlugin> plugin, plugins)
-  {
-    if ((plugin->getState() & (ctkPlugin::ACTIVE | ctkPlugin::STARTING)) != 0)
-    {
-      processPlugin(plugin);
-    }
-  }
-}
-
-void ctkQtMobilityServiceRuntime::stop()
-{
-  this->disconnect(this, SLOT(pluginChanged(ctkPluginEvent)));
-//  Bundle [] b = (Bundle [])bundleComponents.keySet().toArray(new Bundle[bundleComponents.size()]);
-//      for (int i = 0; i < b.length; i++) {
-//        removeBundle(b[i], ComponentConstants.DEACTIVATION_REASON_DISABLED);
-//      }
-}
-
-QServiceManager& ctkQtMobilityServiceRuntime::getQServiceManager()
-{
-  return qServiceManager;
-}
-
-void ctkQtMobilityServiceRuntime::pluginChanged(const ctkPluginEvent& pe)
-{
-  QSharedPointer<ctkPlugin> plugin = pe.getPlugin();
-
-  ctkPluginEvent::Type eventType = pe.getType();
-  if (eventType == ctkPluginEvent::LAZY_ACTIVATION)
-  {
-    lazy.insert(plugin);
-    processPlugin(plugin);
-  }
-  else if (eventType == ctkPluginEvent::STARTED)
-  {
-    if (!lazy.remove(plugin))
-    {
-      processPlugin(plugin);
-    }
-  }
-  else if (eventType == ctkPluginEvent::STOPPING)
-  {
-    lazy.remove(plugin);
-    removePlugin(plugin);
-  }
-}
-
-void ctkQtMobilityServiceRuntime::processPlugin(QSharedPointer<ctkPlugin> plugin)
-{
-  QHash<QString, QString> headers = plugin->getHeaders();
-  QHash<QString, QString>::const_iterator it = headers.find(ctkQtMobilityServiceConstants::SERVICE_DESCRIPTOR);
-  ctkLogService* log = ctkQtMobilityServiceActivator::getLogService();
-  CTK_DEBUG(log)
-      << "Process header " << ctkQtMobilityServiceConstants::SERVICE_DESCRIPTOR
-      << " for plugin #" << plugin->getPluginId() << ": " << (it != headers.end() ? it.value() : "[missing]");
-
-  if (it != headers.end())
-  {
-    QString sd = it.value();
-    if (sd.isEmpty())
-    {
-      QString msg = QString("Header ") + ctkQtMobilityServiceConstants::SERVICE_DESCRIPTOR + " empty.";
-      ctkQtMobilityServiceActivator::logError(plugin->getPluginContext(), msg);
-      return;
-    }
-
-    QByteArray serviceDescription = plugin->getResource(sd);
-    QBuffer serviceBuffer(&serviceDescription);
-    qServiceManager.addService(&serviceBuffer);
-    QServiceManager::Error error = qServiceManager.error();
-    if (!(error == QServiceManager::NoError || error == QServiceManager::ServiceAlreadyExists))
-    {
-      QString msg = QString("Registering the QtMobility service descriptor failed: ") +
-          getQServiceManagerErrorString(error);
-      ctkQtMobilityServiceActivator::logError(plugin->getPluginContext(), msg);
-      return;
-    }
-
-    QString serviceName = plugin->getSymbolicName() + "_" + plugin->getVersion().toString();
-    QList<QServiceInterfaceDescriptor> descriptors = qServiceManager.findInterfaces(serviceName);
-
-    if (descriptors.isEmpty())
-    {
-      QString msg = QString("No interfaces found for service name ") + serviceName;
-      ctkQtMobilityServiceActivator::logWarning(plugin->getPluginContext(), msg);
-      return;
-    }
-
-    QListIterator<QServiceInterfaceDescriptor> it(descriptors);
-    while (it.hasNext())
-    {
-      QServiceInterfaceDescriptor descr = it.next();
-      CTK_DEBUG(ctkQtMobilityServiceActivator::getLogService()) << "Registering:" << descr.interfaceName();
-      QStringList classes;
-      ctkDictionary props;
-
-      QStringList customKeys = descr.customAttributes();
-      QStringListIterator keyIt(customKeys);
-      bool classAttrFound = false;
-      while (keyIt.hasNext())
-      {
-        QString key = keyIt.next();
-        if (key == ctkPluginConstants::OBJECTCLASS)
-        {
-          classAttrFound = true;
-          classes << descr.customAttribute(key);
-        }
-        else
-        {
-          props.insert(key, descr.customAttribute(key));
-        }
-      }
-
-      if (!classAttrFound)
-      {
-        QString msg = QString("The custom attribute \"") + ctkPluginConstants::OBJECTCLASS
-            + "\" is missing in the interface description of \"" + descr.interfaceName();
-        ctkQtMobilityServiceActivator::logError(plugin->getPluginContext(), msg);
-        continue;
-      }
-
-      ctkQtMobilityServiceFactory* serviceObject = new ctkQtMobilityServiceFactory(descr, this, plugin);
-      ctkServiceRegistration serviceReg = plugin->getPluginContext()->registerService(classes, serviceObject, props);
-
-      if (serviceReg)
-      {
-        mapPluginToServiceFactory.insert(plugin, serviceObject);
-        mapPluginToServiceRegistration.insert(plugin, serviceReg);
-      }
-      else
-      {
-        QString msg = QString("Could not register QtMobility service ") + descr.serviceName() + " "
-            + descr.interfaceName();
-        ctkQtMobilityServiceActivator::logError(plugin->getPluginContext(), msg);
-        continue;
-      }
-    }
-  }
-}
-
-void ctkQtMobilityServiceRuntime::removePlugin(QSharedPointer<ctkPlugin> plugin)
-{
-  CTK_DEBUG(ctkQtMobilityServiceActivator::getLogService())
-      << "Remove " << plugin->getSymbolicName() << " from QtMobSR";
-
-  QList<ctkQtMobilityServiceFactory*> serviceFactories = mapPluginToServiceFactory.values(plugin);
-  QList<ctkServiceRegistration> serviceRegs = mapPluginToServiceRegistration.values(plugin);
-  foreach(ctkServiceRegistration serviceReg, serviceRegs)
-  {
-    serviceReg.unregister();
-  }
-
-  mapPluginToServiceRegistration.remove(plugin);
-  mapPluginToServiceFactory.remove(plugin);
-
-  qDeleteAll(serviceFactories);
-}
-
-QString ctkQtMobilityServiceRuntime::getQServiceManagerErrorString(QServiceManager::Error error)
-{
-  switch (error)
-  {
-  case QServiceManager::NoError:
-    return QString("No error occurred.");
-  case QServiceManager::StorageAccessError:
-    return QString("The service data storage is not accessible. This could be because the caller does not have the required permissions.");
-  case QServiceManager::InvalidServiceLocation:
-    return QString("The service was not found at its specified location.");
-  case QServiceManager::InvalidServiceXml:
-    return QString("The XML defining the service metadata is invalid.");
-  case QServiceManager::InvalidServiceInterfaceDescriptor:
-    return QString("The service interface descriptor is invalid, or refers to an interface implementation that cannot be accessed in the current scope.");
-  case QServiceManager::ServiceAlreadyExists:
-    return QString("Another service has previously been registered with the same location.");
-  case QServiceManager::ImplementationAlreadyExists:
-    return QString("Another service that implements the same interface version has previously been registered.");
-  case QServiceManager::PluginLoadingFailed:
-    return QString("The service plugin cannot be loaded.");
-  case QServiceManager::ComponentNotFound:
-    return QString("The service or interface implementation has not been registered.");
-  case QServiceManager::ServiceCapabilityDenied:
-    return QString("The security session does not allow the service based on its capabilities.");
-  case QServiceManager::UnknownError:
-    return QString("An unknown error occurred.");
-  default:
-    return QString("Unknown error enum.");
-  }
-}

Plugins/org.commontk.qtmobility.service/ctkQtMobilityServiceRuntime_p.h

@@ -1,82 +0,0 @@
-/*=============================================================================
-
-  Library: CTK
-
-  Copyright (c) German Cancer Research Center,
-    Division of Medical and Biological Informatics
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-=============================================================================*/
-
-
-#ifndef CTKQTMOBILITYSERVICERUNTIME_P_H
-#define CTKQTMOBILITYSERVICERUNTIME_P_H
-
-#include <QObject>
-#include <QServiceManager>
-
-#include <ctkPluginEvent.h>
-#include <ctkPlugin.h>
-#include <ctkServiceRegistration.h>
-
-class ctkPluginContext;
-class ctkQtMobilityServiceFactory;
-
-using namespace QtMobility;
-
-class ctkQtMobilityServiceRuntime : public QObject
-{
-  Q_OBJECT
-
-public:
-
-  ctkQtMobilityServiceRuntime(ctkPluginContext* pc);
-
-  void start();
-  void stop();
-
-  QServiceManager& getQServiceManager();
-
-protected slots:
-
-  void pluginChanged(const ctkPluginEvent& pe);
-
-private:
-
-  QtMobility::QServiceManager qServiceManager;
-
-  QMultiHash<QSharedPointer<ctkPlugin>, ctkQtMobilityServiceFactory*> mapPluginToServiceFactory;
-  QMultiHash<QSharedPointer<ctkPlugin>, ctkServiceRegistration> mapPluginToServiceRegistration;
-  QSet<QSharedPointer<ctkPlugin> > lazy;
-
-  ctkPluginContext* pc;
-
-  /**
-   * Check if the plugin has a service descriptor and register it.
-   *
-   * @param plugin Plugin to check
-   */
-  void processPlugin(QSharedPointer<ctkPlugin> plugin);
-
-  /**
-   * Remove service resources for plugin
-   *
-   * @param p Plugin to check
-   */
-  void removePlugin(QSharedPointer<ctkPlugin> plugin);
-
-  static QString getQServiceManagerErrorString(QServiceManager::Error error);
-};
-
-#endif // CTKQTMOBILITYSERVICERUNTIME_P_H

Plugins/org.commontk.qtmobility.service/manifest_headers.cmake

@@ -1 +0,0 @@
-SET(Plugin-ActivationPolicy "eager")

Plugins/org.commontk.qtmobility.service/target_libraries.cmake

@@ -1,10 +0,0 @@
-#
-# See CMake/ctkFunctionGetTargetLibraries.cmake
-# 
-# This file should list the libraries required to build the current CTK plugin.
-# 
-
-SET(target_libraries
-  CTKPluginFramework
-  QtMobility_LIBRARIES
-  )

SuperBuild.cmake

@@ -30,7 +30,6 @@ SET(external_projects
   PythonQtGenerator # Should be added after PythonQt - See comment in CMakeExternals/PythonQtGenerator.cmake
   DCMTK
   ZMQ
-  QtMobility
   QtSOAP
   qxmlrpc
   OpenIGTLink
@@ -53,7 +52,7 @@ SET(CTK_EXTERNAL_LIBRARY_DIRS)
 
 #-----------------------------------------------------------------------------
 # Make sure ${CTK_BINARY_DIR}/CTK-build/bin exists
-# May be used by some external project to install libs (e.g QtMobility)
+# May be used by some external project to install libs 
 IF(NOT EXISTS ${CTK_BINARY_DIR}/CTK-build/bin)
   FILE(MAKE_DIRECTORY ${CTK_BINARY_DIR}/CTK-build/bin)
 ENDIF()

Utilities/CMake/FindQtMobility.cmake

@@ -1,35 +0,0 @@
-IF(NOT QtMobility_FOUND)
-  FIND_PACKAGE(QtMobility QUIET NO_MODULE)
-ENDIF()
-
-IF(NOT QtMobility_FOUND)
-  SET(QtMobility_DIR "/usr/include/qtmobility/" CACHE PATH "Root of QtMobility source tree")
-  MARK_AS_ADVANCED(QtMobility_DIR)
-
-  FIND_PATH(QTMOBILITY_QTSERVICEFW_INCLUDE_DIR QServiceManager
-            PATHS ${QtMobility_DIR}/include NO_DEFAULT_PATH)
-
-  FIND_LIBRARY(QTMOBILITY_QTSERVICEFW_LIBRARY_DEBUG QtServiceFrameworkd
-               PATHS ${QtMobility_DIR} NO_DEFAULT_PATH)
-
-  FIND_LIBRARY(QTMOBILITY_QTSERVICEFW_LIBRARY_RELEASE QtServiceFramework
-               PATHS ${QTMOBILITY_LIBRARY_DIR} NO_DEFAULT_PATH)
-
-  SET(QTMOBILITY_QTSERVICEFW_LIBRARIES )
-  IF(QTMOBILITY_QTSERVICEFW_LIBRARY_RELEASE AND QTMOBILITY_QTSERVICEFW_LIBRARY_DEBUG)
-    SET(QTMOBILITY_QTSERVICEFW_LIBRARIES 
-        optimized ${QTMOBILITY_QTSERVICEFW_LIBRARY_RELEASE} 
-        debug     ${QTMOBILITY_QTSERVICEFW_LIBRARY_DEBUG})
-  ELSEIF(QTMOBILITY_QTSERVICEFW_LIBRARY_DEBUG)
-    SET(QTMOBILITY_QTSERVICEFW_LIBRARIES ${QTMOBILITY_QTSERVICEFW_LIBRARY_DEBUG})
-  ELSEIF(QTMOBILITY_QTSERVICEFW_LIBRARY_RELEASE)
-    SET(QTMOBILITY_QTSERVICEFW_LIBRARIES ${QTMOBILITY_QTSERVICEFW_LIBRARY_RELEASE})
-  ENDIF()
-
-  SET(QtMobility_LIBRARIES ${QTMOBILITY_QTSERVICEFW_LIBRARIES})
-  SET(QtMobility_INCLUDE_DIRS ${QTMOBILITY_QTSERVICEFW_INCLUDE_DIR})
-
-  IF(QtMobility_INCLUDE_DIRS AND QtMobility_LIBRARIES)
-    SET(QtMobility_FOUND 1)
-  ENDIF()
-ENDIF()

Utilities/QtMobility/QtMobility-1.0.0-apple.patch

@@ -1,44 +0,0 @@
-*** ../qt-mobility-src-1.0.0-beta1/configure	2010-02-12 03:54:12.000000000 -0500
---- configure	2010-03-24 18:51:06.000000000 -0400
-***************
-*** 413,423 ****
-  }
-  
-  #compile tests
-! compileTest QMF qmf
-! compileTest NetworkManager networkmanager
-! compileTest "CoreWLAN (MacOS 10.6)" corewlan
-! compileTest "Maemo ICD" maemo-icd
-! compileTest "Maemo ICD WLAN" maemo-icd-network-wlan
-  
-  # Now module selection
-  # using 'expr match ....' should help a bit
---- 413,423 ----
-  }
-  
-  #compile tests
-! #compileTest QMF qmf
-! #compileTest NetworkManager networkmanager
-! #compileTest "CoreWLAN (MacOS 10.6)" corewlan
-! #compileTest "Maemo ICD" maemo-icd
-! #compileTest "Maemo ICD WLAN" maemo-icd-network-wlan
-  
-  # Now module selection
-  # using 'expr match ....' should help a bit
-***************
-*** 493,499 ****
-  fi
-  
-  echo "Running qmake..."
-! if qmake -recursive "$relpath/qtmobility.pro"; then
-      echo ""
-      echo "configure has finished. You may run make or gmake to build the project now."
-  else
---- 493,499 ----
-  fi
-  
-  echo "Running qmake..."
-! if qmake -spec macx-g++ -recursive "$relpath/qtmobility.pro"; then
-      echo ""
-      echo "configure has finished. You may run make or gmake to build the project now."
-  else

Utilities/QtMobility/QtMobility-1.0.0-install-win32.cmake.in

@@ -1,36 +0,0 @@
-EXECUTE_PROCESS(COMMAND @qtmobility_make_cmd@ install
-                OUTPUT_VARIABLE _output)
-
-IF(_output)
-  MESSAGE(${_output})
-ENDIF()
-
-SET(_int_dir )
-IF(INTERMEDIATE_DIRECTORY)
-  GET_FILENAME_COMPONENT(_int_dir ${INTERMEDIATE_DIRECTORY} NAME)
-  IF(NOT EXISTS "@CTK_CMAKE_LIBRARY_OUTPUT_DIRECTORY@/${_int_dir}/")
-    FILE(MAKE_DIRECTORY "@CTK_CMAKE_LIBRARY_OUTPUT_DIRECTORY@/${_int_dir}/")
-	MESSAGE("Creating directory @CTK_CMAKE_LIBRARY_OUTPUT_DIRECTORY@/${_int_dir}")
-  ENDIF()
-ENDIF()
-
-FILE(GLOB _files "@qtmobility_win32_install_prefix@/lib/*")
-FOREACH(_file ${_files})
-  CONFIGURE_FILE(${_file} "@CTK_CMAKE_LIBRARY_OUTPUT_DIRECTORY@/${_int_dir}/" COPYONLY)
-  MESSAGE("Copying ${_file} to @CTK_CMAKE_LIBRARY_OUTPUT_DIRECTORY@/${_int_dir}/")
-ENDFOREACH()
-
-FILE(GLOB _files "@qtmobility_patch_dir@/include/*")
-FOREACH(_file ${_files})
-  CONFIGURE_FILE(${_file} "@qtmobility_win32_install_prefix@/include/" COPYONLY)
-  MESSAGE("Copying ${_file} to @qtmobility_win32_install_prefix@/include/")
-ENDFOREACH()
-
-SET(QTMOBILITY_QTSERVICEFW_INCLUDE_DIR "@qtmobility_win32_install_prefix@/include")
-
-SET(QTMOBILITY_QTSERVICEFW_LIBRARY_DEBUG
-    "@CTK_CMAKE_LIBRARY_OUTPUT_DIRECTORY@/${_int_dir}/@qtmobility_servicefw_libname_debug@")
-SET(QTMOBILITY_QTSERVICEFW_LIBRARY_RELEASE
-    "@CTK_CMAKE_LIBRARY_OUTPUT_DIRECTORY@/${_int_dir}/@qtmobility_servicefw_libname_release@")
-    
-CONFIGURE_FILE("@qtmobility_config_in@" "@qtmobility_config_out@" @ONLY)

Utilities/QtMobility/QtMobility-1.0.0-make-apple.cmake.in

@@ -1,20 +0,0 @@
-
-if(APPLE)
-  set(ENV{MACOSX_DEPLOYMENT_TARGET} "@CMAKE_OSX_DEPLOYMENT_TARGET@")
-
-  set(CMAKE_OSX_ARCHITECTURES "@CMAKE_OSX_ARCHITECTURES@")
-  set(archflags)
-  foreach(arch ${CMAKE_OSX_ARCHITECTURES})
-    set(archflags "${archflags} -arch ${arch}")
-  endforeach()
-  set(ENV{ARCHFLAGS} "${archflags}")
-
-  set(CMAKE_CXX_HAS_ISYSROOT "@CMAKE_CXX_HAS_ISYSROOT@")
-  if(CMAKE_CXX_HAS_ISYSROOT)
-    set(ENV{SDKROOT} "@CMAKE_OSX_SYSROOT@")
-  endif()
-endif()
-
-execute_process(
-  COMMAND make
-  )

Utilities/QtMobility/QtMobility-1.0.0-patch.cmake.in

@@ -1,48 +0,0 @@
-# the patch step is run before the update step
-# so we need to checkout the 1.0 branch here
-
-set(work_dir "@CMAKE_BINARY_DIR@")
-set(proj_dir ${work_dir}/@proj@)
-
-INCLUDE("@CTK_SOURCE_DIR@/CMake/ctkFunctionLFtoCRLF.cmake")
-INCLUDE("@CTK_SOURCE_DIR@/CMake/ctkFunctionApplyPatches.cmake")
-
-SET(patch_dir "@qtmobility_patch_dir@")
-SET(configured_patch_dir "@qtmobility_configured_patch_dir@")
-
-# Variable required to properly configured the patch files
-SET(QT_BINARY_DIR "@QT_BINARY_DIR@")
-
-SET(patch_files
-
-)
-
-IF(UNIX)
-  IF(APPLE)
-    LIST(APPEND patch_files ${patch_dir}/QtMobility-1.0.0-apple.patch)
-  ENDIF()
-ENDIF()
-
-# Apply patches
-IF(patch_files)
-  ctkFunctionApplyPatches("@CTK_PATCH_EXECUTABLE@" "@qtmobility_src_dir@" "${patch_files}")
-ENDIF()
-
-IF(UNIX)
-
-  # replace all occurences of 'qmake' with the aboslute path to the
-  # qmake executable found by CMake.
-  # This is neccessary for custom Qt builds and for Unix/Linux systems
-  # which use another name for the Qt4 qmake program (e.g. qmake-qt4)
-
-  EXECUTE_PROCESS(
-    COMMAND sed -i -e  "s+qmake +@QT_QMAKE_EXECUTABLE@ +g" configure
-    WORKING_DIRECTORY ${proj_dir}
-    RESULT_VARIABLE error_code
-  )
-
-  IF(error_code)
-    MESSAGE(FATAL_ERROR "Patching ${proj_dir}/configure file failed.")
-  ENDIF()
-ENDIF()
-

Utilities/QtMobility/QtMobilityConfig.cmake.in

@@ -1,24 +0,0 @@
-SET(QTMOBILITY_QTSERVICEFW_INCLUDE_DIR "@QTMOBILITY_QTSERVICEFW_INCLUDE_DIR@")
-
-SET(QTMOBILITY_QTSERVICEFW_LIBRARY_DEBUG "@QTMOBILITY_QTSERVICEFW_LIBRARY_DEBUG@")
-IF(NOT EXISTS ${QTMOBILITY_QTSERVICEFW_LIBRARY_DEBUG})
-  SET(QTMOBILITY_QTSERVICEFW_LIBRARY_DEBUG )
-ENDIF()
-
-SET(QTMOBILITY_QTSERVICEFW_LIBRARY_RELEASE "@QTMOBILITY_QTSERVICEFW_LIBRARY_RELEASE@")
-IF(NOT EXISTS ${QTMOBILITY_QTSERVICEFW_LIBRARY_RELEASE})
-  SET(QTMOBILITY_QTSERVICEFW_LIBRARY_RELEASE )
-ENDIF()
-
-SET(QTMOBILITY_QTSERVICEFW_LIBRARIES )
-IF(QTMOBILITY_QTSERVICEFW_LIBRARY_RELEASE AND QTMOBILITY_QTSERVICEFW_LIBRARY_DEBUG)
-  SET(QTMOBILITY_QTSERVICEFW_LIBRARIES optimized ${QTMOBILITY_QTSERVICEFW_LIBRARY_RELEASE} debug ${QTMOBILITY_QTSERVICEFW_LIBRARY_DEBUG})
-ELSEIF(QTMOBILITY_QTSERVICEFW_LIBRARY_DEBUG)
-  SET(QTMOBILITY_QTSERVICEFW_LIBRARIES ${QTMOBILITY_QTSERVICEFW_LIBRARY_DEBUG})
-ELSEIF(QTMOBILITY_QTSERVICEFW_LIBRARY_RELEASE)
-  SET(QTMOBILITY_QTSERVICEFW_LIBRARIES ${QTMOBILITY_QTSERVICEFW_LIBRARY_RELEASE})
-ENDIF()
-
-SET(QtMobility_LIBRARIES ${QTMOBILITY_QTSERVICEFW_LIBRARIES})
-SET(QtMobility_INCLUDE_DIRS ${QTMOBILITY_QTSERVICEFW_INCLUDE_DIR})
-

Utilities/QtMobility/QtMobilityGitBranch1.0-apple.patch

@@ -1,44 +0,0 @@
-*** ../qt-mobility-src-1.0.0-beta1/configure	2010-02-12 03:54:12.000000000 -0500
---- configure	2010-03-24 18:51:06.000000000 -0400
-***************
-*** 413,423 ****
-  }
-  
-  #compile tests
-! compileTest QMF qmf
-! compileTest NetworkManager networkmanager
-! compileTest "CoreWLAN (MacOS 10.6)" corewlan
-! compileTest "Maemo ICD" maemo-icd
-! compileTest "Maemo ICD WLAN" maemo-icd-network-wlan
-  
-  # Now module selection
-  # using 'expr match ....' should help a bit
---- 413,423 ----
-  }
-  
-  #compile tests
-! #compileTest QMF qmf
-! #compileTest NetworkManager networkmanager
-! #compileTest "CoreWLAN (MacOS 10.6)" corewlan
-! #compileTest "Maemo ICD" maemo-icd
-! #compileTest "Maemo ICD WLAN" maemo-icd-network-wlan
-  
-  # Now module selection
-  # using 'expr match ....' should help a bit
-***************
-*** 493,499 ****
-  fi
-  
-  echo "Running qmake..."
-! if qmake -recursive "$relpath/qtmobility.pro"; then
-      echo ""
-      echo "configure has finished. You may run make or gmake to build the project now."
-  else
---- 493,499 ----
-  fi
-  
-  echo "Running qmake..."
-! if qmake -spec macx-g++ -recursive "$relpath/qtmobility.pro"; then
-      echo ""
-      echo "configure has finished. You may run make or gmake to build the project now."
-  else

Utilities/QtMobility/QtMobilityGitBranch1.0-patch.cmake.in

@@ -1,64 +0,0 @@
-# the patch step is run before the update step
-# so we need to checkout the 1.0 branch here
-
-set(work_dir @ep_source_dir@)
-set(proj_dir ${work_dir}/@proj@)
-
-execute_process(
-  COMMAND @Git_EXECUTABLE@ checkout -b branch_1.0 origin/1.0 -t
-  WORKING_DIRECTORY ${proj_dir}
-  ERROR_VARIABLE error_output
-  RESULT_VARIABLE error_code
-  )
-if(error_code)
-  if(NOT ${error_output} MATCHES "branch branch_1.0 already exists")
-    message(FATAL_ERROR "${error_output}")
-  endif()
-endif()
-
-INCLUDE(@CTK_SOURCE_DIR@/CMake/ctkFunctionLFtoCRLF.cmake)
-INCLUDE(@CTK_SOURCE_DIR@/CMake/ctkFunctionApplyPatches.cmake)
-
-SET(patch_dir @qtmobility_patch_dir@)
-SET(configured_patch_dir @qtmobility_configured_patch_dir@)
-
-# Variable required to properly configured the patch files
-SET(QT_BINARY_DIR @QT_BINARY_DIR@)
-
-SET(patch_files
-)
-
-IF(WIN32)
-  CONFIGURE_FILE(${patch_dir}/QtMobilityGitBranch1.0-win32.patch.in
-    ${configured_patch_dir}/QtMobilityGitBranch1.0-win32.patch @ONLY)
-  LIST(APPEND patch_files
-    ${configured_patch_dir}/QtMobilityGitBranch1.0-win32.patch
-    )
-ENDIF()
-
-IF(UNIX)
-  IF(APPLE)
-    LIST(APPEND patch_files ${patch_dir}/QtMobilityGitBranch1.0-apple.patch)
-  ENDIF()
-ENDIF()
-
-# Apply patches
-ctkFunctionApplyPatches("@CTK_PATCH_EXECUTABLE@" "@qtmobility_src_dir@" "${patch_files}")
-
-IF(UNIX)
-
-  # replace all occurences of 'qmake' with the aboslute path to the
-  # qmake executable found by CMake.
-  # This is neccessary for custom Qt builds and for Unix/Linux systems
-  # which use another name for the Qt4 qmake program (e.g. qmake-qt4)
-
-  EXECUTE_PROCESS(
-    COMMAND sed -i "s+qmake +@QT_QMAKE_EXECUTABLE@ +g" configure
-    WORKING_DIRECTORY ${proj_dir}
-    RESULT_VARIABLE error_code
-  )
-
-  IF(error_code)
-    MESSAGE(FATAL_ERROR "Patching ${proj_dir}/configure file failed.")
-  ENDIF()
-ENDIF()

Utilities/QtMobility/QtMobilityGitBranch1.0-win32.patch.in

@@ -1,31 +0,0 @@
---- C:/development/CTK-master-vc9/CMakeExternals/Source/QtMobility/configure_orig.bat	Sun Apr 11 18:17:43 2010
-+++ C:/development/CTK-master-vc9/CMakeExternals/Source/QtMobility/configure.bat	Sun Apr 11 21:19:33 2010
-@@ -60,7 +60,7 @@
- set MOBILITY_MODULES=bearer location contacts multimedia publishsubscribe versit messaging systeminfo serviceframework sensors
- set MOBILITY_MODULES_UNPARSED=
- set VC_TEMPLATE_OPTION=
--set QT_PATH=
-+set QT_PATH=@QT_BINARY_DIR@\
- set QMAKE_CACHE=%BUILD_PATH%\.qmake.cache
- 
- if exist "%QMAKE_CACHE%" del %QMAKE_CACHE%
-@@ -457,10 +457,15 @@
- echo.
- echo Start of compile tests
- REM compile tests go here.
--call :compileTest LBT lbt
--call :compileTest SNAP snap
--call :compileTest OCC occ
--call :compileTest SymbianContactSIM symbiancntsim
-+REM for CTK the compile tests generate errors in Visual Studio -> just disabling them
-+REM call :compileTest LBT lbt
-+echo lbt_enabled = no >> %PROJECT_CONFIG%
-+REM call :compileTest SNAP snap
-+echo snap_enabled = no >> %PROJECT_CONFIG%
-+REM call :compileTest OCC occ
-+echo occ_enabled = no >> %PROJECT_CONFIG%
-+REM call :compileTest SymbianContactSIM symbiancntsim
-+echo symbiancntsim_enabled = no >> %PROJECT_CONFIG%
- echo End of compile tests
- echo.
- echo.

Utilities/QtMobility/README.txt

@@ -1,13 +0,0 @@
-This directory contains a stripped QtMobility 1.0.0 tar ball containing
-only the service framework sources. The following files have been modified:
-
-- qtmobility.pro (exclude the plugins directory)
-- configure.bat (skip compile tests)
-
-On Windows, Perl would be needed for a working install step (for
-generating the header file wrappers). To avoid having another
-dependency on an external tool, everything is installed in a
-common directory (prefix). The lib files are then copied to the
-CTK binary dir and the header file wrappers are copied by cmake
-into the install dir.
-

Utilities/QtMobility/include/QAbstractSecuritySession

@@ -1 +0,0 @@
-#include "qabstractsecuritysession.h"

Utilities/QtMobility/include/QServiceContext

@@ -1 +0,0 @@
-#include "qservicecontext.h"

Utilities/QtMobility/include/QServiceFilter

@@ -1 +0,0 @@
-#include "qservicefilter.h"

Utilities/QtMobility/include/QServiceInterfaceDescriptor

@@ -1 +0,0 @@
-#include "qserviceinterfacedescriptor.h"

Utilities/QtMobility/include/QServiceManager

@@ -1 +0,0 @@
-#include "qservicemanager.h"

Utilities/QtMobility/include/QServicePluginInterface

@@ -1 +0,0 @@
-#include "qserviceplugininterface.h"