summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2018-05-09 13:23:17 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2018-05-16 12:42:27 +0000
commit580fdd43c23aa409880a64f7dc0ce04ec57a1bcd (patch)
tree5394df2c8aaf9de282641227ee1670fd016a797d
parent3e8fb932531bd66f0fe79960744df4f5f6656515 (diff)
Fix build without qtlocation
Change-Id: I81ac6fcf14563a6d093c51d93754d438992ee52a Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
-rw-r--r--src/core/content_browser_client_qt.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp
index 30ec43ca0..1949823fe 100644
--- a/src/core/content_browser_client_qt.cpp
+++ b/src/core/content_browser_client_qt.cpp
@@ -68,6 +68,7 @@
#include "content/public/common/main_function_params.h"
#include "content/public/common/service_names.mojom.h"
#include "content/public/common/url_constants.h"
+#include "device/geolocation/public/cpp/location_provider.h"
#include "mojo/public/cpp/bindings/binding.h"
#include "mojo/public/cpp/bindings/binding_set.h"
#include "printing/features/features.h"
@@ -123,6 +124,10 @@
#include "renderer_host/pepper/pepper_host_factory_qt.h"
#endif
+#if defined(QT_USE_POSITIONING)
+#include "location_provider_qt.h"
+#endif
+
#include <QGuiApplication>
#include <QLocale>
#ifndef QT_NO_OPENGL
@@ -737,7 +742,11 @@ bool ContentBrowserClientQt::CanCreateWindow(
std::unique_ptr<device::LocationProvider> ContentBrowserClientQt::OverrideSystemLocationProvider()
{
+#if defined(QT_USE_POSITIONING)
return base::WrapUnique(new LocationProviderQt());
+#else
+ return nullptr;
+#endif
}
scoped_refptr<net::URLRequestContextGetter> GetSystemRequestContextOnUIThread()