diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-02-03 11:03:28 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-04 00:16:31 +0100 |
| commit | 39ec04fedbc2862073ed38b61e152d9e0d73077d (patch) | |
| tree | cf6fae1a60c604bc0209263c087d2eb91b08510f /Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp | |
| parent | 6f8e14c26b58761241a5b3a8429f15a809afa649 (diff) | |
| download | qtwebkit-39ec04fedbc2862073ed38b61e152d9e0d73077d.tar.gz | |
Fix ambiguous cast
The conversion from uint64_t to QFlags is now ambiguous, but since
we need an int QVariant in the end anyway, we can cast directly to that.
Change-Id: I4478efa2b293a59b47c46d27346b56eab48b3278
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp')
| -rw-r--r-- | Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp b/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp index 1ad486950..30b6984cc 100644 --- a/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp +++ b/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp @@ -1918,7 +1918,7 @@ QVariant QQuickWebView::inputMethodQuery(Qt::InputMethodQuery property) const case Qt::ImMaximumTextLength: return QVariant(); // No limit. case Qt::ImHints: - return int(Qt::InputMethodHints(state.inputMethodHints)); + return QVariant(static_cast<int>(state.inputMethodHints)); default: // Rely on the base implementation for ImEnabled, ImHints and ImPreferredLanguage. return QQuickFlickable::inputMethodQuery(property); |