diff options
| author | Kalle Viironen <kalle.viironen@digia.com> | 2014-05-26 13:52:23 +0300 |
|---|---|---|
| committer | Kalle Viironen <kalle.viironen@digia.com> | 2014-05-26 13:52:28 +0300 |
| commit | ec41c61fab5f20f52c2a7f1da9a7e2e552fc53d1 (patch) | |
| tree | 8c220e410846744050738ad5709d8259cb2841ac /src/engine.h | |
| parent | 34bf5aeee929308c825395d6ddb8e62772bbf0cf (diff) | |
| parent | 7cfc9355cb22e5ac92529b077215f36b60048d04 (diff) | |
Merge branch 'stable' into releaseQtEE_v3.0.0
* stable:
Auto-select a demo on startup as well as on movement stop
Add possibility to launch QtWebEngine applications
Change-Id: I54c688a28649b7dac0c3a40210695377bb75be6e
Diffstat (limited to 'src/engine.h')
| -rw-r--r-- | src/engine.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/engine.h b/src/engine.h index 89fa28d..a837879 100644 --- a/src/engine.h +++ b/src/engine.h @@ -71,6 +71,7 @@ public: void setWindow(QQuickWindow *window) { m_window = window; } + Q_INVOKABLE QUrl fromUserInput(const QString& userInput) { return QUrl::fromUserInput(userInput); } Q_INVOKABLE int sensibleButtonSize() const; Q_INVOKABLE int titleBarSize() const; Q_INVOKABLE int smallFontSize() const { return qMax<int>(m_dpcm * 0.4, 10); } |