diff options
| author | Lincoln Ramsay <lincoln.ramsay@nokia.com> | 2012-02-17 11:45:05 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-17 06:12:24 +0100 |
| commit | 01a842c2fbfb5a74d61481165cc6d722de7c49ba (patch) | |
| tree | be27924422bc00f965ab3244b07256bdc00c50f3 /src/sensors/gestures | |
| parent | fbc2e2ca805b97bdbef4a3b6b6a276215ba668df (diff) | |
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 <zsolt.simon@nokia.com>
Diffstat (limited to 'src/sensors/gestures')
| -rw-r--r-- | src/sensors/gestures/qsensorgesturemanager.h | 5 |
1 files changed, 1 insertions, 4 deletions
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 <QtSensors/qsensorplugindefs.h> 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 |