diff options
| author | Pierre Rossi <pierre.rossi@digia.com> | 2013-09-05 15:55:00 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-17 15:06:19 +0200 |
| commit | 7642fabf5f62fbc583dc6bd9f349dbe1e45e805a (patch) | |
| tree | f493be28f91e06b46534061bcd251d259105da58 /lib/type_conversion.h | |
| parent | d9276b51c64c2b0b1cd97dcd02c0a83e78018f81 (diff) | |
Add javascript dialogs support
This is just the basic core part and widgets plumbing and default
implementations of the virtual functions in QWebEnginePage.
QtQuick implementation is still yet to be done
Change-Id: I7cf8d6e5ec0bf747d45e9914db57bd0e4ef95b7f
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'lib/type_conversion.h')
| -rw-r--r-- | lib/type_conversion.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/type_conversion.h b/lib/type_conversion.h index 2b7dee25b..6e2f55957 100644 --- a/lib/type_conversion.h +++ b/lib/type_conversion.h @@ -51,11 +51,16 @@ #include "ui/gfx/rect.h" #include "url/gurl.h" -inline QString toQt(const string16 &string) +inline QString toQt(const base::string16 &string) { return QString::fromUtf16(string.data()); } +inline base::string16 toString16(const QString &qString) +{ + return base::string16(qString.utf16()); +} + inline QUrl toQt(const GURL &url) { return QUrl(QString::fromStdString(url.spec())); |