diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-10-02 17:51:06 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-04 12:13:01 +0200 |
| commit | 29ca4c5f8ef9840864961dd7abbe323b81ffe625 (patch) | |
| tree | 21e2949f8685cf1d5ed1c7d54b4c0732fe12319d | |
| parent | 7d9d4f0dfe7fe6cab21c4dd45d2e86e7c49ed20a (diff) | |
Crash on GeoLocation demo
Apply missing QtLocation -> QtPositioning renaming.
This was causing GeoLocationController to never be set.
Change-Id: Id6b110ee2df3047b11e1c13ff5a1d2eb9d8b4c40
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
| -rw-r--r-- | Source/WebKit/WebKit1.pro | 2 | ||||
| -rw-r--r-- | Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp | 6 | ||||
| -rw-r--r-- | Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.h | 2 | ||||
| -rw-r--r-- | Source/WebKit/qt/WidgetApi/qwebpage.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/Source/WebKit/WebKit1.pro b/Source/WebKit/WebKit1.pro index be04ca370..6dbb90736 100644 --- a/Source/WebKit/WebKit1.pro +++ b/Source/WebKit/WebKit1.pro @@ -98,7 +98,7 @@ INCLUDEPATH += \ use?(3D_GRAPHICS): WEBKIT += angle -have?(qtlocation):enable?(GEOLOCATION) { +have?(qtpositioning):enable?(GEOLOCATION) { HEADERS += \ $$PWD/qt/WebCoreSupport/GeolocationClientQt.h SOURCES += \ diff --git a/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp b/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp index 475d1edb5..658566f5c 100644 --- a/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp +++ b/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp @@ -54,7 +54,7 @@ #if ENABLE(GEOLOCATION) #include "GeolocationClientMock.h" #include "GeolocationController.h" -#if HAVE(QTLOCATION) +#if HAVE(QTPOSITIONING) #include "GeolocationClientQt.h" #endif #endif @@ -237,7 +237,7 @@ void QWebPageAdapter::initializeWebCorePage() WebCore::provideGeolocationTo(page, mock); mock->setController(WebCore::GeolocationController::from(page)); } -#if HAVE(QTLOCATION) +#if HAVE(QTPOSITIONING) else WebCore::provideGeolocationTo(page, new GeolocationClientQt(this)); #endif @@ -1236,7 +1236,7 @@ void QWebPageAdapter::setSystemTrayIcon(QObject *icon) #endif // QT_NO_SYSTEMTRAYICON #endif // ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS) -#if ENABLE(GEOLOCATION) && HAVE(QTLOCATION) +#if ENABLE(GEOLOCATION) && HAVE(QTPOSITIONING) void QWebPageAdapter::setGeolocationEnabledForFrame(QWebFrameAdapter* frame, bool on) { GeolocationPermissionClientQt::geolocationPermissionClient()->setPermission(frame, on); diff --git a/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.h b/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.h index 4141298aa..26de9d0bb 100644 --- a/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.h +++ b/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.h @@ -309,7 +309,7 @@ public: QString contextMenuItemTagForAction(MenuAction, bool* checkable) const; QStringList supportedContentTypes() const; -#if ENABLE(GEOLOCATION) && HAVE(QTLOCATION) +#if ENABLE(GEOLOCATION) && HAVE(QTPOSITIONING) void setGeolocationEnabledForFrame(QWebFrameAdapter*, bool); #endif #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS) diff --git a/Source/WebKit/qt/WidgetApi/qwebpage.cpp b/Source/WebKit/qt/WidgetApi/qwebpage.cpp index 0f3f14d39..d69d673bb 100644 --- a/Source/WebKit/qt/WidgetApi/qwebpage.cpp +++ b/Source/WebKit/qt/WidgetApi/qwebpage.cpp @@ -1612,7 +1612,7 @@ void QWebPage::setFeaturePermission(QWebFrame* frame, Feature feature, Permissio #endif break; case Geolocation: -#if ENABLE(GEOLOCATION) && HAVE(QTLOCATION) +#if ENABLE(GEOLOCATION) && HAVE(QTPOSITIONING) if (policy != PermissionUnknown) d->setGeolocationEnabledForFrame(frame->d, (policy == PermissionGrantedByUser)); #endif |