diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-11-24 08:46:23 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-25 08:24:29 +0100 |
| commit | acbe469322d0ab4aac863192ca5bf6fe1feedaed (patch) | |
| tree | 99fecca57b0781744aa2ec93b03240a9b7b91b84 /examples/sensors/grue/lib/gruesensor.h | |
| parent | f3a86a85b9a4f6d0f22364dcb66e2a8b9f21a9be (diff) | |
QtSensors: Fix compilation of examples/warnings on Windows.
- Fix double->float truncation in tests
- Use -rdynamic for g++ only
- Introduce EXPORT macro in grue library for Windows to work
- Add DESTDIR for the grue lib (to prevent it from ending up
in the debug/release subfolders, respectively
Change-Id: I3b902b501483c92639c0a6252240db4ed8a4a00d
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
Diffstat (limited to 'examples/sensors/grue/lib/gruesensor.h')
| -rw-r--r-- | examples/sensors/grue/lib/gruesensor.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/examples/sensors/grue/lib/gruesensor.h b/examples/sensors/grue/lib/gruesensor.h index 48df1fd8..1465aaaa 100644 --- a/examples/sensors/grue/lib/gruesensor.h +++ b/examples/sensors/grue/lib/gruesensor.h @@ -45,7 +45,13 @@ class GrueSensorReadingPrivate; -class GrueSensorReading : public QSensorReading +#if defined(QT_BUILD_GRUE_LIB) +# define Q_GRUE_EXPORT Q_DECL_EXPORT +#else +# define Q_GRUE_EXPORT Q_DECL_IMPORT +#endif + +class Q_GRUE_EXPORT GrueSensorReading : public QSensorReading { Q_OBJECT Q_PROPERTY(qreal chanceOfBeingEaten READ chanceOfBeingEaten WRITE setChanceOfBeingEaten) @@ -57,7 +63,7 @@ public: // begin generated code -class GrueFilter : public QSensorFilter +class Q_GRUE_EXPORT GrueFilter : public QSensorFilter { public: virtual bool filter(GrueSensorReading *reading) = 0; @@ -65,7 +71,7 @@ private: bool filter(QSensorReading *reading) { return filter(static_cast<GrueSensorReading*>(reading)); } }; -class GrueSensor : public QSensor +class Q_GRUE_EXPORT GrueSensor : public QSensor { Q_OBJECT public: |