summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZoltan Arvai <zarvai@inf.u-szeged.hu>2014-02-06 23:32:34 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-11 15:00:20 +0100
commit8bd101c4ce0fb3f1198f31ce4966b20b78169e34 (patch)
tree4e9579fbee5666f6fcb13254057dba720f74b13e
parent98ac42c78dc9118eacf85f9f817b7d287d9ff02d (diff)
Fix WebEngineWidgets api build on Windows
MSVC doesn't know __func__ so it needs to be defined. Also eliminate some unused variable warning. Change-Id: Ia42e411c0af8425a71faf99a87dbc0affac53015 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
-rw-r--r--src/webenginewidgets/api/qwebenginehistory.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/webenginewidgets/api/qwebenginehistory.cpp b/src/webenginewidgets/api/qwebenginehistory.cpp
index 2dd69dcf..be2534de 100644
--- a/src/webenginewidgets/api/qwebenginehistory.cpp
+++ b/src/webenginewidgets/api/qwebenginehistory.cpp
@@ -45,6 +45,10 @@
#include "qwebenginepage_p.h"
#include "web_contents_adapter.h"
+#if defined(Q_OS_WIN)
+#define __func__ __FUNCTION__
+#endif
+
QT_BEGIN_NAMESPACE
QWebEngineHistoryItemPrivate::QWebEngineHistoryItemPrivate(WebContentsAdapter *adapter, int index)
@@ -110,6 +114,7 @@ QVariant QWebEngineHistoryItem::userData() const
void QWebEngineHistoryItem::setUserData(const QVariant& userData)
{
+ Q_UNUSED(userData);
qWarning("Not implemented: %s", __func__);
}
@@ -270,17 +275,20 @@ int QWebEngineHistory::maximumItemCount() const
void QWebEngineHistory::setMaximumItemCount(int count)
{
+ Q_UNUSED(count);
qWarning("Not implemented: %s", __func__);
}
QDataStream& operator<<(QDataStream& stream, const QWebEngineHistory& history)
{
+ Q_UNUSED(history);
qWarning("Not implemented: %s", __func__);
return stream;
}
QDataStream& operator>>(QDataStream& stream, QWebEngineHistory& history)
{
+ Q_UNUSED(history);
qWarning("Not implemented: %s", __func__);
return stream;
}