diff options
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/WebKit/WebKit1.pri | 2 | ||||
| -rw-r--r-- | Source/WebKit/qt/WebCoreSupport/GeolocationClientQt.cpp | 2 | ||||
| -rw-r--r-- | Source/WebKit2/Target.pri | 2 | ||||
| -rw-r--r-- | Source/WebKit2/UIProcess/qt/WebGeolocationProviderQt.cpp | 4 | ||||
| -rw-r--r-- | Source/WebKit2/WebKit2.pri | 2 | ||||
| -rw-r--r-- | Source/sync.profile | 1 |
6 files changed, 7 insertions, 6 deletions
diff --git a/Source/WebKit/WebKit1.pri b/Source/WebKit/WebKit1.pri index 06ac16031..6fc182941 100644 --- a/Source/WebKit/WebKit1.pri +++ b/Source/WebKit/WebKit1.pri @@ -14,7 +14,7 @@ INCLUDEPATH += \ have?(qtsensors):if(enable?(DEVICE_ORIENTATION)|enable?(ORIENTATION_EVENTS)): QT += sensors -have?(qtlocation):enable?(GEOLOCATION): QT += location +have?(qtpositioning):enable?(GEOLOCATION): QT += positioning contains(CONFIG, texmap): DEFINES += WTF_USE_TEXTURE_MAPPER=1 diff --git a/Source/WebKit/qt/WebCoreSupport/GeolocationClientQt.cpp b/Source/WebKit/qt/WebCoreSupport/GeolocationClientQt.cpp index 26d1b407a..b4c5189f6 100644 --- a/Source/WebKit/qt/WebCoreSupport/GeolocationClientQt.cpp +++ b/Source/WebKit/qt/WebCoreSupport/GeolocationClientQt.cpp @@ -36,7 +36,7 @@ #include "QWebFrameAdapter.h" #include "QWebPageAdapter.h" -#include <QtLocation/QGeoPositionInfoSource> +#include <QtPositioning/QGeoPositionInfoSource> namespace WebCore { diff --git a/Source/WebKit2/Target.pri b/Source/WebKit2/Target.pri index 7bac383f2..597e01088 100644 --- a/Source/WebKit2/Target.pri +++ b/Source/WebKit2/Target.pri @@ -937,7 +937,7 @@ enable?(TOUCH_EVENTS) { } -have?(qtlocation):enable?(GEOLOCATION): QT += location +have?(qtpositioning):enable?(GEOLOCATION): QT += positioning use?(3D_GRAPHICS): WEBKIT += angle diff --git a/Source/WebKit2/UIProcess/qt/WebGeolocationProviderQt.cpp b/Source/WebKit2/UIProcess/qt/WebGeolocationProviderQt.cpp index 038992143..7d05f043e 100644 --- a/Source/WebKit2/UIProcess/qt/WebGeolocationProviderQt.cpp +++ b/Source/WebKit2/UIProcess/qt/WebGeolocationProviderQt.cpp @@ -21,8 +21,8 @@ #include "config.h" #include "WebGeolocationProviderQt.h" -#if ENABLE(GEOLOCATION) && HAVE(QTLOCATION) -#include <QtLocation/QGeoPositionInfoSource> +#if ENABLE(GEOLOCATION) && HAVE(QTPOSITIONING) +#include <QtPositioning/QGeoPositionInfoSource> namespace WebKit { diff --git a/Source/WebKit2/WebKit2.pri b/Source/WebKit2/WebKit2.pri index cf1d549dd..cf154cc19 100644 --- a/Source/WebKit2/WebKit2.pri +++ b/Source/WebKit2/WebKit2.pri @@ -82,6 +82,6 @@ linux-*: { have?(QTQUICK): QT += qml quick -have?(qtlocation):enable?(GEOLOCATION): QT += location +have?(qtpositioning):enable?(GEOLOCATION): QT += positioning enable?(SECCOMP_FILTERS): PKGCONFIG += libseccomp diff --git a/Source/sync.profile b/Source/sync.profile index 53063aaa3..801c563b6 100644 --- a/Source/sync.profile +++ b/Source/sync.profile @@ -20,6 +20,7 @@ %dependencies = ( "qtbase" => "", "qtdeclarative" => "", + "qtlocation" => "", "qtmultimedia" => "", "qtsensors" => "", ); |