summaryrefslogtreecommitdiffstats
path: root/src/webengine/plugin/experimental
diff options
context:
space:
mode:
authorPierre Rossi <pierre.rossi@digia.com>2014-03-06 20:46:19 +0100
committerPierre Rossi <pierre.rossi@gmail.com>2014-09-02 10:02:07 +0200
commit33a0ed37321edf6f1d9e89fa55e820800cec031c (patch)
tree52cede0b50f2f854b9f4543ec14e9b5cc82addb1 /src/webengine/plugin/experimental
parentc6c1da2f4c71e523213aa8ee961d8fec779f62e2 (diff)
Settings for Qt quick
Expose settings in experimental for now. Simply use the global/per-view mechanism as a group level in between seems like overkill. Change-Id: I7610e9c7765ccb41674702acdd24a52b87716da8 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'src/webengine/plugin/experimental')
-rw-r--r--src/webengine/plugin/experimental/plugin.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/webengine/plugin/experimental/plugin.cpp b/src/webengine/plugin/experimental/plugin.cpp
index f517a28ca..883ebc598 100644
--- a/src/webengine/plugin/experimental/plugin.cpp
+++ b/src/webengine/plugin/experimental/plugin.cpp
@@ -37,11 +37,18 @@
#include <QtQml/qqmlextensionplugin.h>
#include "qquickwebenginehistory_p.h"
+#include "qquickwebenginesettings_p.h"
+#include "qquickwebenginesingleton_p.h"
#include "qquickwebengineview_p.h"
#include "qquickwebengineview_p_p.h"
QT_BEGIN_NAMESPACE
+static QObject *webEngineSingletonProvider(QQmlEngine *, QJSEngine *)
+{
+ return new QQuickWebEngineSingleton;
+}
+
class QQuickWebEngineViewExperimentalExtension : public QObject {
Q_OBJECT
Q_PROPERTY(QQuickWebEngineViewExperimental* experimental READ experimental CONSTANT FINAL)
@@ -71,6 +78,9 @@ public:
QObject::tr("Cannot create a separate instance of NavigationHistory"));
qmlRegisterUncreatableType<QQuickWebEngineHistoryListModel>(uri, 1, 0, "NavigationHistoryListModel",
QObject::tr("Cannot create a separate instance of NavigationHistory"));
+ qmlRegisterUncreatableType<QQuickWebEngineSettings>(uri, 1, 0, "WebEngineSettings",
+ QObject::tr("Cannot create a separate instance of WebEngineSettings"));
+ qmlRegisterSingletonType<QQuickWebEngineSingleton>(uri, 1, 0, "WebEngine", webEngineSingletonProvider);
}
};