diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-19 11:05:55 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-19 11:06:33 +0100 |
| commit | 50c16eab20a6d9884ab3149ef59137a10de63e6d (patch) | |
| tree | 2684617d911514147283516ddd15803a4049da61 /src/sensors/qirproximitysensor_p.h | |
| parent | d2cafb8506b798bad7fa56f19557dd6e1cb25cd7 (diff) | |
| parent | 879e5536b033302b2ad976750cd2351674e161d6 (diff) | |
| download | qtsensors-50c16eab20a6d9884ab3149ef59137a10de63e6d.tar.gz | |
Merge branch 'dev' into stable
This starts Qt 5.1 release cycle
Change-Id: Idce0f9b94f9e585abfb6903f554500a06f4f8aaa
Diffstat (limited to 'src/sensors/qirproximitysensor_p.h')
| -rw-r--r-- | src/sensors/qirproximitysensor_p.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/sensors/qirproximitysensor_p.h b/src/sensors/qirproximitysensor_p.h index 6241b62..9b16af5 100644 --- a/src/sensors/qirproximitysensor_p.h +++ b/src/sensors/qirproximitysensor_p.h @@ -53,7 +53,6 @@ // We mean it. // -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QIRProximityReadingPrivate @@ -68,6 +67,5 @@ public: }; QT_END_NAMESPACE -QT_END_HEADER #endif |