From 89315f81abf11c9f5096d63b2bce2200ab45a9e7 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Mon, 30 Nov 2015 14:49:28 +0100 Subject: Remove explicit version \inqmlmodule Also bump version in \qmlmodule QtWebEngine 1.2 Change-Id: I4d0379a3a46548e626508a8cf1fad51f742c8ddb Reviewed-by: Leena Miettinen --- src/webengine/api/qquickwebenginesingleton.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/webengine/api/qquickwebenginesingleton.cpp') diff --git a/src/webengine/api/qquickwebenginesingleton.cpp b/src/webengine/api/qquickwebenginesingleton.cpp index 7ff974eb4..ba4d47016 100644 --- a/src/webengine/api/qquickwebenginesingleton.cpp +++ b/src/webengine/api/qquickwebenginesingleton.cpp @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE /*! \qmltype WebEngine \instantiates QQuickWebEngineSingleton - \inqmlmodule QtWebEngine 1.1 + \inqmlmodule QtWebEngine \since QtWebEngine 1.1 \brief Provides access to the default settings and profiles shared by all web engine views. -- cgit v1.2.1 From 28b08c849efc361b42e79b69e76541d9b0faddd9 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Fri, 27 Nov 2015 16:15:32 +0100 Subject: Make QQuickWebEngineProfile public Make QQuickWebEngineProfile a publicly exported class. This allows users to set up and manipulate the profile from C++, and removes the ugly hack needed to access the cookie store. Change-Id: I99e1a8c2cb99d9d1a14e1c78bec5948ba1282fb3 Reviewed-by: Allan Sandfeld Jensen --- src/webengine/api/qquickwebenginesingleton.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/webengine/api/qquickwebenginesingleton.cpp') diff --git a/src/webengine/api/qquickwebenginesingleton.cpp b/src/webengine/api/qquickwebenginesingleton.cpp index ba4d47016..b7a8c3b69 100644 --- a/src/webengine/api/qquickwebenginesingleton.cpp +++ b/src/webengine/api/qquickwebenginesingleton.cpp @@ -37,7 +37,7 @@ #include "qquickwebenginesingleton_p.h" #include "qquickwebenginesettings_p.h" -#include "qquickwebengineprofile_p.h" +#include QT_BEGIN_NAMESPACE -- cgit v1.2.1