MER: Build on qtdeclarative 5.6

sailfishos · Jun 24, 2016 · ee43fe9 · ee43fe9
1 parent 43dc39a
commit ee43fe9
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 2 deletions.
diff --git a/src/imports/positioning/positioning.cpp b/src/imports/positioning/positioning.cpp
@@ -113,7 +113,6 @@ class QtPositioningDeclarativeModule: public QQmlExtensionPlugin
             // Register the 5.2 types
             minor = 2;
             qmlRegisterSingletonType<LocationSingleton  >(uri, major, minor, "QtPositioning", singleton_type_factory);
-            qmlRegisterValueTypeEnums<GeoShapeValueType >(uri, major, minor, "GeoShape");
             qmlRegisterType<QDeclarativePosition        >(uri, major, minor, "Position");
             qmlRegisterType<QDeclarativePositionSource  >(uri, major, minor, "PositionSource");
             qmlRegisterType<QDeclarativeGeoAddress      >(uri, major, minor, "Address");

diff --git a/src/imports/positioning/qdeclarativeposition_p.h b/src/imports/positioning/qdeclarativeposition_p.h
@@ -46,7 +46,6 @@
 #include <QDateTime>
 #include <qgeopositioninfosource.h>
 #include <qgeopositioninfo.h>
-#include "qdeclarativecoordinate_p.h"
 #include <QtQml/qqml.h>
 
 // Define this to get qDebug messages