aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorjuhvu <qt-info@nokia.com>2011-09-22 15:20:07 +1000
committerQt by Nokia <qt-info@nokia.com>2011-10-04 05:16:43 +0200
commitea4c24256db58b162778dabd7a26935f75d81d8b (patch)
tree4bdf0df36636b3aa92a59e853561f6faba508f6d /src
parent4c01174b63e049eeb945081e1e6cc7b09514fc6b (diff)
Exported QSGMouseArea and QSGMouseEvent as private exports.
QtLocation uses QSGMouseAreas internally in the MapMouseArea and MapMouse event (it can't support standard MouseAreas due to its domain specific requirements). Exporting those classes as private exports will enable significant code re-use. Dependencies on privates of other modules is never ideal, but it is notable that MapMouseAreas use only the public properties of the QSGMouse classes. Exports are needed to be able to instantiate them as well as to connect to their property signals (and work without reinterpret casts). (Copying QSGMouse classes to QtLocation is not practical they are very intertwined with QSG internals). Change-Id: I98651f9d525abc3b7319e027e47c71b3e3c5fe51 Reviewed-on: http://codereview.qt-project.org/5352 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src')
-rw-r--r--src/declarative/items/qsgevents_p_p.h3
-rw-r--r--src/declarative/items/qsgmousearea_p.h3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/declarative/items/qsgevents_p_p.h b/src/declarative/items/qsgevents_p_p.h
index 0aa95c017b..1d2b6a9dec 100644
--- a/src/declarative/items/qsgevents_p_p.h
+++ b/src/declarative/items/qsgevents_p_p.h
@@ -90,7 +90,8 @@ private:
QKeyEvent event;
};
-class QSGMouseEvent : public QObject
+// used in QtLocation
+class Q_DECLARATIVE_EXPORT QSGMouseEvent : public QObject
{
Q_OBJECT
Q_PROPERTY(int x READ x)
diff --git a/src/declarative/items/qsgmousearea_p.h b/src/declarative/items/qsgmousearea_p.h
index 0ec9c6b335..a8015fc99b 100644
--- a/src/declarative/items/qsgmousearea_p.h
+++ b/src/declarative/items/qsgmousearea_p.h
@@ -149,7 +149,8 @@ private:
};
class QSGMouseAreaPrivate;
-class Q_AUTOTEST_EXPORT QSGMouseArea : public QSGItem
+// used in QtLocation
+class Q_DECLARATIVE_EXPORT QSGMouseArea : public QSGItem
{
Q_OBJECT