From fd247c68523c35b93a72b2046d3fd8367d391ce8 Mon Sep 17 00:00:00 2001 From: Frank Meerkoetter Date: Sat, 21 May 2016 21:12:26 +0200 Subject: Fix compile issue Building qtwebengine failed with Yocto2.1/GCC5.3 with an IMX.6 ARM target. Adding the include fixed the issue. compiling .moc/moc_qquickwebengineview_p.cpp .moc/moc_qquickwebengineview_p.cpp: In static member function 'static void QQuickWebEngineView::qt_static_metacall(QObject*, QMetaObject::Call, int, void**)': .moc/moc_qquickwebengineview_p.cpp:866:72: error: invalid use of incomplete type 'class QColor' case 15: *reinterpret_cast< QColor*>(_v) = _t->backgroundColor(); break; ^ In file included from /data/projects/fsl-community-bsp/build/tmp/sysroots/wandboard/usr/include/qt5/QtCore/qobject.h:48:0, from /data/projects/fsl-community-bsp/build/tmp/sysroots/wandboard/usr/include/qt5/QtCore/QObject:1, from .moc/../api/qquickwebenginescript_p.h:52, from .moc/../api/qquickwebengineview_p.h:52, from .moc/moc_qquickwebengineview_p.cpp:9: /data/projects/fsl-community-bsp/build/tmp/sysroots/wandboard/usr/include/qt5/QtCore/qmetatype.h:1886:1: note: forward declaration of 'class QColor' Change-Id: If58315d4c0b5087705687ae582ffe86702063937 Reviewed-by: Allan Sandfeld Jensen --- src/webengine/api/qquickwebengineview_p.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/webengine/api/qquickwebengineview_p.h b/src/webengine/api/qquickwebengineview_p.h index 98d0bbc1d..93ef9e4fb 100644 --- a/src/webengine/api/qquickwebengineview_p.h +++ b/src/webengine/api/qquickwebengineview_p.h @@ -51,6 +51,7 @@ #include #include "qquickwebenginescript_p.h" #include +#include QT_BEGIN_NAMESPACE -- cgit v1.2.3 From 628f7c1de60f66f4b2e179c98bf403f647d8ad60 Mon Sep 17 00:00:00 2001 From: Antti Kokko Date: Wed, 25 May 2016 09:30:42 +0300 Subject: Doc: Remove repository name from examplesinstallpath MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Examples in binary packages now directly match the install path. Change-Id: I701bb08e189ae4e3ebb6cb10118900ce72791e3b Reviewed-by: Topi Reiniö --- src/webengine/doc/qtwebengine.qdocconf | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/webengine/doc/qtwebengine.qdocconf b/src/webengine/doc/qtwebengine.qdocconf index e151b78a4..c80768a81 100644 --- a/src/webengine/doc/qtwebengine.qdocconf +++ b/src/webengine/doc/qtwebengine.qdocconf @@ -4,8 +4,6 @@ project = QtWebEngine description = Qt WebEngine Reference Documentation version = $QT_VERSION -examplesinstallpath = qtwebengine - qhp.projects = QtWebEngine qhp.QtWebEngine.file = qtwebengine.qhp -- cgit v1.2.3