From 01a842c2fbfb5a74d61481165cc6d722de7c49ba Mon Sep 17 00:00:00 2001 From: Lincoln Ramsay Date: Fri, 17 Feb 2012 11:45:05 +1000 Subject: Update REGISTER_STATIC_PLUGIN_V2 (compile) Ideally, this macro would only consist of a Q_EXPORT_PLUGIN / Q_IMPORT_PLUGIN combination but there is no 'static' version of Q_EXPORT_PLUGIN available unless we're a static build of Qt. Thus, this macro duplicates the logic from the correct Q_EXPORT_PLUGIN macro here. Use the new code so that we can compile apps that use REGISTER_STATIC_PLUGIN_V2 (like the unit test). Using an ifdef so we don't break people who haven't updated qtbase yet. Refactor the headers so we only have 1 copy of this macro. Change-Id: Id8c69833029bdd54b66d24dea878b0603b0cb6e9 Reviewed-by: Zsolt Simon --- src/sensors/gestures/qsensorgesturemanager.h | 5 +- src/sensors/qsensormanager.h | 27 +-------- src/sensors/qsensorplugindefs.h | 86 ++++++++++++++++++++++++++++ src/sensors/sensors.pro | 3 +- 4 files changed, 90 insertions(+), 31 deletions(-) create mode 100644 src/sensors/qsensorplugindefs.h (limited to 'src/sensors') diff --git a/src/sensors/gestures/qsensorgesturemanager.h b/src/sensors/gestures/qsensorgesturemanager.h index aa5841ad..7b9e4896 100644 --- a/src/sensors/gestures/qsensorgesturemanager.h +++ b/src/sensors/gestures/qsensorgesturemanager.h @@ -47,6 +47,7 @@ #include "qsensorgesture.h" #include "qsensorgesturerecognizer.h" +#include QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -78,8 +79,4 @@ signals: QT_END_NAMESPACE QT_END_HEADER -#define REGISTER_STATIC_PLUGIN_V2(pluginname) \ - QT_PREPEND_NAMESPACE(QObject) *qt_plugin_instance_##pluginname() Q_PLUGIN_INSTANCE(pluginname)\ - Q_IMPORT_PLUGIN(pluginname) - #endif // QSENSORGESTUREMANAGER_P_H diff --git a/src/sensors/qsensormanager.h b/src/sensors/qsensormanager.h index 27ff6c82..0cd151d1 100644 --- a/src/sensors/qsensormanager.h +++ b/src/sensors/qsensormanager.h @@ -43,6 +43,7 @@ #define QSENSORMANAGER_H #include "qsensor.h" +#include "qsensorplugindefs.h" QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -77,32 +78,6 @@ protected: ~QSensorBackendFactory() {} }; -// The default is for legacy static plugins -// This will change to Qt-style static plugins in 1.3 -#define REGISTER_STATIC_PLUGIN(pluginname) \ - REGISTER_STATIC_PLUGIN_V1(pluginname) - -// Legacy static plugins have their own registration methods. -// They can only register types. They cannot use the changes interface. -#define REGISTER_STATIC_PLUGIN_V1(pluginname) \ - static QSensorPluginInterface *create_static_plugin_ ## pluginname()\ - {\ - return new pluginname;\ - }\ - static bool side_effect_sensor_backend_ ## pluginname ()\ - {\ - QSensorManager::registerStaticPlugin(create_static_plugin_ ## pluginname);\ - return false;\ - }\ - /* This assignment calls the function above */\ - static bool dummy_sensor_backend_ ## pluginname = side_effect_sensor_backend_ ## pluginname(); - -// Qt-style static plugins use macros from Qt. -// They are handled just like regular plugins. -#define REGISTER_STATIC_PLUGIN_V2(pluginname) \ - QT_PREPEND_NAMESPACE(QObject) *qt_plugin_instance_##pluginname() Q_PLUGIN_INSTANCE(pluginname)\ - Q_IMPORT_PLUGIN(pluginname) - QT_END_NAMESPACE QT_END_HEADER diff --git a/src/sensors/qsensorplugindefs.h b/src/sensors/qsensorplugindefs.h new file mode 100644 index 00000000..b9173b14 --- /dev/null +++ b/src/sensors/qsensorplugindefs.h @@ -0,0 +1,86 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/ +** +** This file is part of the QtSensors module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QSENSORPLUGINDEFS_H +#define QSENSORPLUGINDEFS_H + +#include + +// The default is for legacy static plugins +// This will change to Qt-style static plugins in 1.3 +#define REGISTER_STATIC_PLUGIN(pluginname) \ + REGISTER_STATIC_PLUGIN_V1(pluginname) + +// Legacy static plugins have their own registration methods. +// They can only register types. They cannot use the changes interface. +#define REGISTER_STATIC_PLUGIN_V1(pluginname) \ + static QSensorPluginInterface *create_static_plugin_ ## pluginname()\ + {\ + return new pluginname;\ + }\ + static bool side_effect_sensor_backend_ ## pluginname ()\ + {\ + QSensorManager::registerStaticPlugin(create_static_plugin_ ## pluginname);\ + return false;\ + }\ + /* This assignment calls the function above */\ + static bool dummy_sensor_backend_ ## pluginname = side_effect_sensor_backend_ ## pluginname(); + +// Qt-style static plugins use macros from Qt. +// They are handled just like regular plugins. +// FIXME remove the ifdef and else case once everyone is using the new qtbase +#ifdef QT_MOC_EXPORT_PLUGIN +#define REGISTER_STATIC_PLUGIN_V2(pluginname) \ + static QT_PREPEND_NAMESPACE(QObject) *qt_plugin_instance() \ + Q_PLUGIN_INSTANCE(pluginname) \ + const QT_PREPEND_NAMESPACE(QStaticPlugin) qt_static_plugin_##pluginname() { \ + QT_PREPEND_NAMESPACE(QStaticPlugin) plugin = { qt_plugin_instance, 0 }; \ + return plugin; \ + }\ + Q_IMPORT_PLUGIN(pluginname) +#else +#define REGISTER_STATIC_PLUGIN_V2(pluginname) \ + QT_PREPEND_NAMESPACE(QObject) *qt_plugin_instance_##pluginname() Q_PLUGIN_INSTANCE(pluginname)\ + Q_IMPORT_PLUGIN(pluginname) +#endif + + +#endif diff --git a/src/sensors/sensors.pro b/src/sensors/sensors.pro index 02d38cf2..0f918697 100644 --- a/src/sensors/sensors.pro +++ b/src/sensors/sensors.pro @@ -14,7 +14,8 @@ QT = core core-private DEFINES += QT_BUILD_SENSORS_LIB QT_MAKEDLL load(qt_module_config) -HEADERS += qtsensorsversion.h +HEADERS += qtsensorsversion.h \ + qsensorplugindefs.h symbian { -- cgit v1.2.3