summaryrefslogtreecommitdiffstats
path: root/src/core/type_conversion.h
diff options
context:
space:
mode:
authorJocelyn Turcotte <jocelyn.turcotte@digia.com>2014-03-20 16:43:59 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-03-31 16:44:09 +0200
commit3512a6cfe07cb7108485b3e39d586612aa5ed3d8 (patch)
tree3ac7d8f90cd8dce201c52cd3a714ecc536f120ff /src/core/type_conversion.h
parent40eb43479251385f61253b613e56507f01248e8d (diff)
Implement QWebEngineHistoryItem::lastVisited
Change-Id: I105cb2a0a2479b146e2ab68db6d194ac2ac2d3f9 Reviewed-by: Andras Becsi <andras.becsi@digia.com> Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'src/core/type_conversion.h')
-rw-r--r--src/core/type_conversion.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/core/type_conversion.h b/src/core/type_conversion.h
index 5e489353c..5d5dc356d 100644
--- a/src/core/type_conversion.h
+++ b/src/core/type_conversion.h
@@ -43,11 +43,13 @@
#define TYPE_CONVERSION_H
#include <QColor>
+#include <QDateTime>
#include <QMatrix4x4>
#include <QRect>
#include <QString>
#include <QUrl>
#include "base/files/file_path.h"
+#include "base/time/time.h"
#include "third_party/skia/include/utils/SkMatrix44.h"
#include "third_party/skia/include/core/SkColor.h"
#include "ui/gfx/rect.h"
@@ -126,6 +128,11 @@ inline QMatrix4x4 toQt(const SkMatrix44 &m)
m.get(3, 0), m.get(3, 1), m.get(3, 2), m.get(3, 3));
}
+inline QDateTime toQt(base::Time time)
+{
+ return QDateTime::fromMSecsSinceEpoch(time.ToJavaTime());
+}
+
inline base::FilePath::StringType toFilePathString(const QString &str)
{
#if defined(OS_WIN)