diff options
31 files changed, 77 insertions, 304 deletions
diff --git a/.qmake.conf b/.qmake.conf index a942dacce..b9d228cf5 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -5,4 +5,4 @@ QTWEBENGINE_OUT_ROOT = $$shadowed($$PWD) load(qt_build_config) CONFIG += warning_clean -MODULE_VERSION = 5.15.0 +MODULE_VERSION = 6.0.0 diff --git a/configure.pri b/configure.pri index 37a855177..9a5b8af4a 100644 --- a/configure.pri +++ b/configure.pri @@ -162,11 +162,17 @@ defineTest(qtConfTest_detectFlex) { } defineTest(qtConfTest_detectNinja) { - ninja = $$qtConfFindInPath("ninja$$EXE_SUFFIX") + ninja = $$qtConfFindInPath($$(NINJA) "ninja$$EXE_SUFFIX") !isEmpty(ninja) { qtLog("Found ninja from path: $$ninja") qtRunLoggedCommand("$$ninja --version", version)|return(false) - contains(version, "1\.([7-9]|1[0-9])\..*"): return(true) + contains(version, "1\.([7-9]|1[0-9])\..*") { + $${1}.path = $$ninja + export($${1}.path) + $${1}.cache += path + export($${1}.cache) + return(true) + } qtLog("Ninja version too old") } qtLog("Building own ninja") diff --git a/dependencies.yaml b/dependencies.yaml new file mode 100644 index 000000000..41e001996 --- /dev/null +++ b/dependencies.yaml @@ -0,0 +1,19 @@ +dependencies: + ../qtdeclarative: + ref: 399ebb5635efc897d29efba90f92f931843b266a + required: true +# ../qtlocation: +# ref: a8793c6d9695498b3a53793f21859421262b4541 +# required: false +# ../qtquickcontrols: +# ref: 59749d56d666a6687fcedc2f7892080467db8574 +# required: false + ../qtquickcontrols2: + ref: b60edab10cd5e5cffde22382eccf3d1c21e258c9 + required: false + ../qttools: + ref: ae93fab03d3192f1ed32471a58f58e34f757c1cd + required: false +# ../qtwebchannel: +# ref: 432ed9647818ca652eec64a24860823ecc326f4a +# required: false diff --git a/examples/pdfwidgets/pdfviewer/zoomselector.cpp b/examples/pdfwidgets/pdfviewer/zoomselector.cpp index 0205489aa..e38140e67 100644 --- a/examples/pdfwidgets/pdfviewer/zoomselector.cpp +++ b/examples/pdfwidgets/pdfviewer/zoomselector.cpp @@ -57,11 +57,11 @@ ZoomSelector::ZoomSelector(QWidget *parent) addItem(QLatin1String("200%")); addItem(QLatin1String("400%")); - connect(this, static_cast<void(QComboBox::*)(const QString &)>(&QComboBox::currentIndexChanged), + connect(this, &QComboBox::currentIndexChanged, this, &ZoomSelector::onCurrentTextChanged); connect(lineEdit(), &QLineEdit::editingFinished, - this, [this](){onCurrentTextChanged(lineEdit()->text()); }); + this, [this](){onCurrentTextChanged(0, lineEdit()->text()); }); } void ZoomSelector::setZoomFactor(qreal zoomFactor) @@ -74,7 +74,7 @@ void ZoomSelector::reset() setCurrentIndex(8); // 100% } -void ZoomSelector::onCurrentTextChanged(const QString &text) +void ZoomSelector::onCurrentTextChanged(int, const QString &text) { if (text == QLatin1String("Fit Width")) { emit zoomModeChanged(QPdfView::FitToWidth); diff --git a/examples/pdfwidgets/pdfviewer/zoomselector.h b/examples/pdfwidgets/pdfviewer/zoomselector.h index c58d09970..0f27bafb4 100644 --- a/examples/pdfwidgets/pdfviewer/zoomselector.h +++ b/examples/pdfwidgets/pdfviewer/zoomselector.h @@ -57,7 +57,7 @@ signals: void zoomFactorChanged(qreal zoomFactor); private slots: - void onCurrentTextChanged(const QString &text); + void onCurrentTextChanged(int, const QString &text); }; #endif // ZOOMSELECTOR_H diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf index db0b072a7..36af78f33 100644 --- a/mkspecs/features/functions.prf +++ b/mkspecs/features/functions.prf @@ -57,10 +57,13 @@ defineReplace(pythonPathForSystem) { } defineReplace(ninjaPath) { - src_3rd_party_dir = $$absolute_path("$${getChromiumSrcDir()}/../", "$$QTWEBENGINE_ROOT") - out = $$shadowed($$absolute_path(ninja/ninja, $$src_3rd_party_dir)) - win32: out = $${out}.exe - return($$out) + isEmpty(QMAKE_NINJA) { + src_3rd_party_dir = $$absolute_path("$${getChromiumSrcDir()}/../", "$$QTWEBENGINE_ROOT") + out = $$shadowed($$absolute_path(ninja/ninja, $$src_3rd_party_dir)) + win32: out = $${out}.exe + QMAKE_NINJA = $$out + } + return($$QMAKE_NINJA) } defineReplace(gnPath) { diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json index 1298ab916..27bd3ebf8 100644 --- a/src/buildtools/configure.json +++ b/src/buildtools/configure.json @@ -305,7 +305,8 @@ }, "webengine-ninja": { "label": "system ninja", - "type": "detectNinja" + "type": "detectNinja", + "log": "path" }, "webengine-python2": { "label": "python2", @@ -436,7 +437,10 @@ "webengine-system-ninja": { "label": "Use System Ninja", "condition": "tests.webengine-ninja", - "output": [ "privateFeature" ] + "output": [ + "privateFeature", + { "type": "varAssign", "name": "QMAKE_NINJA", "value": "tests.webengine-ninja.path" } + ] }, "webengine-system-fontconfig": { "label": "fontconfig", diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro index 033202e6e..9e8cfe157 100644 --- a/src/buildtools/gn.pro +++ b/src/buildtools/gn.pro @@ -11,8 +11,6 @@ build_pass|!debug_and_release { buildgn.target = build_gn out = $$gnPath() out_path = $$dirname(out) - !qtConfig(webengine-system-ninja): ninja_path = $$ninjaPath() - else: ninja_path="ninja" # check if it is not already build !exists($$out) { src_3rd_party_dir = $$absolute_path("$${getChromiumSrcDir()}/../", "$$QTWEBENGINE_ROOT") @@ -32,7 +30,7 @@ build_pass|!debug_and_release { !system("$$pythonPathForSystem() $$gn_configure") { error("GN generation error!") } - !system("cd $$system_quote($$system_path($$out_path)) && $$ninja_path $$basename(out)" ) { + !system("cd $$system_quote($$system_path($$out_path)) && $$system_quote($$system_path($$ninjaPath())) $$basename(out)" ) { error("GN build error!") } } diff --git a/src/core/api/core_api.pro b/src/core/api/core_api.pro index d53fb6942..c4ad5f643 100644 --- a/src/core/api/core_api.pro +++ b/src/core/api/core_api.pro @@ -66,12 +66,6 @@ SOURCES = \ qwebengineurlscheme.cpp \ qwebengineurlschemehandler.cpp -### Qt6 Remove this workaround -unix:!isEmpty(QMAKE_LFLAGS_VERSION_SCRIPT):!static { - SOURCES += qtbug-60565.cpp \ - qtbug-61521.cpp -} - # Chromium headers included are not remotely clean CONFIG -= warning_clean diff --git a/src/core/api/qtbug-60565.cpp b/src/core/api/qtbug-60565.cpp deleted file mode 100644 index f48a2a701..000000000 --- a/src/core/api/qtbug-60565.cpp +++ /dev/null @@ -1,138 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWebEngine module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include <new> -#include <unistd.h> - -#if defined(__LP64__) -# define SIZE_T_MANGLING "m" -#else -# define SIZE_T_MANGLING "j" -#endif - -#define SHIM_ALIAS_SYMBOL(fn) __attribute__((weak, alias(#fn))) -#define SHIM_HIDDEN __attribute__ ((visibility ("hidden"))) - -extern "C" { - -__asm__(".symver __ShimCppNew, _Znw" SIZE_T_MANGLING "@Qt_5"); -void* __ShimCppNew(size_t size) - SHIM_ALIAS_SYMBOL(ShimCppNew); - -__asm__(".symver __ShimCppDelete, _ZdlPv@Qt_5"); -void __ShimCppDelete(void* address) - SHIM_ALIAS_SYMBOL(ShimCppDelete); - -__asm__(".symver __ShimCppNewArray, _Zna" SIZE_T_MANGLING "@Qt_5"); -void* __ShimCppNewArray(size_t size) - SHIM_ALIAS_SYMBOL(ShimCppNewArray); - -__asm__(".symver __ShimCppDeleteArray, _ZdaPv@Qt_5"); -void __ShimCppDeleteArray(void* address) - SHIM_ALIAS_SYMBOL(ShimCppDeleteArray); - -__asm__(".symver __ShimCppNewNoThrow, _Znw" SIZE_T_MANGLING "RKSt9nothrow_t@Qt_5"); -void *__ShimCppNewNoThrow(size_t size, const std::nothrow_t&) noexcept - SHIM_ALIAS_SYMBOL(ShimCppNewNoThrow); - -__asm__(".symver __ShimCppNewArrayNoThrow, _Zna" SIZE_T_MANGLING "RKSt9nothrow_t@Qt_5"); -void *__ShimCppNewArrayNoThrow(size_t size, const std::nothrow_t&) noexcept - SHIM_ALIAS_SYMBOL(ShimCppNewArrayNoThrow); - -__asm__(".symver __ShimCppDeleteNoThrow, _ZdlPvRKSt9nothrow_t@Qt_5"); -void __ShimCppDeleteNoThrow(void* address, const std::nothrow_t&) noexcept - SHIM_ALIAS_SYMBOL(ShimCppDeleteNoThrow); - -__asm__(".symver __ShimCppDeleteArrayNoThrow, _ZdaPvRKSt9nothrow_t@Qt_5"); -void __ShimCppDeleteArrayNoThrow(void* address, const std::nothrow_t&) noexcept - SHIM_ALIAS_SYMBOL(ShimCppDeleteArrayNoThrow); - -static void* __shimCppNew(size_t size); -static void* __shimCppNewArray(size_t size); -static void __shimCppDelete(void *address); -static void __shimCppDeleteArray(void *address); - -SHIM_HIDDEN void* ShimCppNew(size_t size) { - return __shimCppNew(size); -} - -SHIM_HIDDEN void* ShimCppNewNoThrow(size_t size, const std::nothrow_t&) noexcept { - return __shimCppNew(size); -} - -SHIM_HIDDEN void* ShimCppNewArray(size_t size) { - return __shimCppNewArray(size); -} - -SHIM_HIDDEN void* ShimCppNewArrayNoThrow(size_t size, const std::nothrow_t&) noexcept { - return __shimCppNewArray(size); -} - -SHIM_HIDDEN void ShimCppDelete(void* address) { - __shimCppDelete(address); -} - -SHIM_HIDDEN void ShimCppDeleteNoThrow(void* address, const std::nothrow_t&) noexcept { - __shimCppDelete(address); -} - -SHIM_HIDDEN void ShimCppDeleteArray(void* address) { - __shimCppDeleteArray(address); -} - -SHIM_HIDDEN void ShimCppDeleteArrayNoThrow(void* address, const std::nothrow_t&) noexcept { - __shimCppDeleteArray(address); -} -} // extern "C" - -static void* __shimCppNew(size_t size) { - return operator new(size); -} - -static void* __shimCppNewArray(size_t size) { - return operator new[](size); -} - -static void __shimCppDelete(void* address) { - operator delete(address); -} - -static void __shimCppDeleteArray(void* address) { - operator delete[](address); -} diff --git a/src/core/api/qtbug-61521.cpp b/src/core/api/qtbug-61521.cpp deleted file mode 100644 index 002a1af22..000000000 --- a/src/core/api/qtbug-61521.cpp +++ /dev/null @@ -1,120 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWebEngine module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include <stdlib.h> -#include <malloc.h> - -#define SHIM_ALIAS_SYMBOL(fn) __attribute__((weak, alias(#fn))) -#define SHIM_SYMBOL_VERSION(fn) __asm__(".symver __" #fn "," #fn "@Qt_5") -#define SHIM_HIDDEN __attribute__ ((visibility ("hidden"))) - -extern "C" { - -SHIM_SYMBOL_VERSION(malloc); -void* __malloc(size_t size) - SHIM_ALIAS_SYMBOL(ShimMalloc); - -SHIM_SYMBOL_VERSION(free); -void __free(void* ptr) - SHIM_ALIAS_SYMBOL(ShimFree); - -SHIM_SYMBOL_VERSION(realloc); -void* __realloc(void* ptr, size_t size) - SHIM_ALIAS_SYMBOL(ShimRealloc); - -SHIM_SYMBOL_VERSION(calloc); -void* __calloc(size_t n, size_t size) - SHIM_ALIAS_SYMBOL(ShimCalloc); - -SHIM_SYMBOL_VERSION(cfree); -void __cfree(void* ptr) - SHIM_ALIAS_SYMBOL(ShimCFree); - -SHIM_SYMBOL_VERSION(memalign); -void* __memalign(size_t align, size_t s) - SHIM_ALIAS_SYMBOL(ShimMemalign); - -SHIM_SYMBOL_VERSION(valloc); -void* __valloc(size_t size) - SHIM_ALIAS_SYMBOL(ShimValloc); - -SHIM_SYMBOL_VERSION(pvalloc); -void* __pvalloc(size_t size) - SHIM_ALIAS_SYMBOL(ShimPvalloc); - -SHIM_SYMBOL_VERSION(posix_memalign); -int __posix_memalign(void** r, size_t a, size_t s) - SHIM_ALIAS_SYMBOL(ShimPosixMemalign); - -SHIM_HIDDEN void* ShimMalloc(size_t size) { - return malloc(size); -} - -SHIM_HIDDEN void ShimFree(void* ptr) { - free(ptr); -} - -SHIM_HIDDEN void* ShimRealloc(void* ptr, size_t size) { - return realloc(ptr,size); -} - -SHIM_HIDDEN void* ShimCalloc(size_t n, size_t size) { - return calloc(n,size); -} - -SHIM_HIDDEN void ShimCFree(void* ptr) { - free(ptr); -} - -SHIM_HIDDEN void* ShimMemalign(size_t align, size_t s) { - return memalign(align,s); -} - -SHIM_HIDDEN void* ShimValloc(size_t size) { - return valloc(size); -} - -SHIM_HIDDEN void* ShimPvalloc(size_t size) { - return pvalloc(size); -} - -SHIM_HIDDEN int ShimPosixMemalign(void** r, size_t a, size_t s) { - return posix_memalign(r,a,s); -} -} // extern "C" diff --git a/src/core/compositor/compositor.cpp b/src/core/compositor/compositor.cpp index 82a9f7ee4..5c51fca9a 100644 --- a/src/core/compositor/compositor.cpp +++ b/src/core/compositor/compositor.cpp @@ -60,7 +60,7 @@ Compositor::Compositor(content::RenderWidgetHost *host) m_beginFrameSource = std::make_unique<viz::DelayBasedBeginFrameSource>( std::make_unique<viz::DelayBasedTimeSource>(m_taskRunner.get()), - viz::BeginFrameSource::kNotRestartableId); + 0 /*viz::BeginFrameSource::kNotRestartableId*/); } Compositor::~Compositor() diff --git a/src/core/gn_run.pro b/src/core/gn_run.pro index 8b16d7c59..4f1ccce43 100644 --- a/src/core/gn_run.pro +++ b/src/core/gn_run.pro @@ -7,11 +7,7 @@ TEMPLATE = aux qtConfig(debug_and_release): CONFIG += debug_and_release qtConfig(build_all): CONFIG += build_all -qtConfig(webengine-system-ninja) { - QT_TOOL.ninja.binary = ninja -} else { - QT_TOOL.ninja.binary = $$shell_quote($$shell_path($$ninjaPath())) -} +QT_TOOL.ninja.binary = $$shell_quote($$shell_path($$ninjaPath())) win32 { # Add the gnuwin32/bin subdir of qt5.git to PATH. Needed for calling bison and friends. diff --git a/src/core/renderer/user_resource_controller.cpp b/src/core/renderer/user_resource_controller.cpp index 5c1bd301f..3c1ad0477 100644 --- a/src/core/renderer/user_resource_controller.cpp +++ b/src/core/renderer/user_resource_controller.cpp @@ -197,8 +197,8 @@ void UserResourceController::runScripts(UserScriptData::InjectionPoint p, blink: if (!renderView) return; - QList<uint64_t> scriptsToRun = m_viewUserScriptMap.value(0).toList(); - scriptsToRun.append(m_viewUserScriptMap.value(renderView).toList()); + QList<uint64_t> scriptsToRun = m_viewUserScriptMap.value(0).values(); + scriptsToRun.append(m_viewUserScriptMap.value(renderView).values()); for (uint64_t id : qAsConst(scriptsToRun)) { const UserScriptData &script = m_scripts.value(id); diff --git a/src/pdf/api/qpdfpagerenderer.h b/src/pdf/api/qpdfpagerenderer.h index c7b8de0df..bb5505462 100644 --- a/src/pdf/api/qpdfpagerenderer.h +++ b/src/pdf/api/qpdfpagerenderer.h @@ -42,11 +42,11 @@ #include <QtCore/qobject.h> #include <QtCore/qsize.h> +#include <QtPdf/qpdfdocument.h> #include <QtPdf/qpdfdocumentrenderoptions.h> QT_BEGIN_NAMESPACE -class QPdfDocument; class QPdfPageRendererPrivate; class Q_PDF_EXPORT QPdfPageRenderer : public QObject diff --git a/src/pdf/qpdfpagerenderer.cpp b/src/pdf/qpdfpagerenderer.cpp index 31d9f4e1e..460e95bed 100644 --- a/src/pdf/qpdfpagerenderer.cpp +++ b/src/pdf/qpdfpagerenderer.cpp @@ -38,7 +38,6 @@ #include <private/qobject_p.h> #include <QMutex> -#include <QPdfDocument> #include <QPointer> #include <QThread> diff --git a/src/pdf/quick/qquickpdfselection_p.h b/src/pdf/quick/qquickpdfselection_p.h index bb4a50fed..d231c0d11 100644 --- a/src/pdf/quick/qquickpdfselection_p.h +++ b/src/pdf/quick/qquickpdfselection_p.h @@ -53,9 +53,9 @@ #include <QVariant> #include <QtQml/qqml.h> -QT_BEGIN_NAMESPACE +#include "qquickpdfdocument_p.h" -class QQuickPdfDocument; +QT_BEGIN_NAMESPACE class QQuickPdfSelection : public QObject { diff --git a/src/process/process.pro b/src/process/process.pro index 66fdf9797..55b43ecad 100644 --- a/src/process/process.pro +++ b/src/process/process.pro @@ -50,7 +50,7 @@ qtConfig(build_all): CONFIG += build_all qtConfig(framework) { # Deploy the QtWebEngineProcess app bundle into the QtWebEngineCore framework. - DESTDIR = $$MODULE_BASE_OUTDIR/lib/QtWebEngineCore.framework/Versions/5/Helpers + DESTDIR = $$MODULE_BASE_OUTDIR/lib/QtWebEngineCore.framework/Versions/$$QT_MAJOR_VERSION/Helpers # Deploy the entitlements file so macdeployqt can use it. entitlements.files = QtWebEngineProcess.entitlements @@ -64,7 +64,7 @@ qtConfig(framework) { msvc: QMAKE_LFLAGS *= /LARGEADDRESSAWARE qtConfig(framework) { - target.path = $$[QT_INSTALL_LIBS]/QtWebEngineCore.framework/Versions/5/Helpers + target.path = $$[QT_INSTALL_LIBS]/QtWebEngineCore.framework/Versions/$$QT_MAJOR_VERSION/Helpers } else { target.path = $$[QT_INSTALL_LIBEXECS] } diff --git a/src/src.pro b/src/src.pro index 063c148b5..0247f937e 100644 --- a/src/src.pro +++ b/src/src.pro @@ -55,7 +55,7 @@ qtConfig(build-qtpdf):qtConfig(webengine-qtpdf-support) { !qtConfig(webengine-core-support):if(qtConfig(build-qtwebengine-core)|qtConfig(build-qtpdf)) { !qtwebengine_makeCheckError():!isEmpty(skipBuildReason):!build_pass { - errorbuild.commands = @echo Modules will not be built. $${skipBuildReason} + errorbuild.commands = @echo $$shell_quote(Modules will not be built. $${skipBuildReason}) errorbuild.CONFIG = phony QMAKE_EXTRA_TARGETS += errorbuild first.depends += errorbuild diff --git a/src/webengine/api/qquickwebenginedownloaditem_p.h b/src/webengine/api/qquickwebenginedownloaditem_p.h index e1b1b9040..38293cd30 100644 --- a/src/webengine/api/qquickwebenginedownloaditem_p.h +++ b/src/webengine/api/qquickwebenginedownloaditem_p.h @@ -52,16 +52,18 @@ // #include <QtWebEngine/private/qtwebengineglobal_p.h> + #include <QObject> #include <QScopedPointer> #include <QString> #include <QUrl> +#include "qquickwebengineview_p.h" + QT_BEGIN_NAMESPACE class QQuickWebEngineDownloadItemPrivate; class QQuickWebEngineProfilePrivate; -class QQuickWebEngineView; class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineDownloadItem: public QObject { Q_OBJECT diff --git a/src/webengine/api/qquickwebenginesingleton_p.h b/src/webengine/api/qquickwebenginesingleton_p.h index ba63382e5..5edf95303 100644 --- a/src/webengine/api/qquickwebenginesingleton_p.h +++ b/src/webengine/api/qquickwebenginesingleton_p.h @@ -52,11 +52,12 @@ // #include <QtWebEngine/private/qtwebengineglobal_p.h> + +#include <QtWebEngine/qquickwebengineprofile.h> +#include <QtWebEngine/private/qquickwebenginesettings_p.h> #include <QObject> QT_BEGIN_NAMESPACE -class QQuickWebEngineProfile; -class QQuickWebEngineSettings; class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineSingleton : public QObject { Q_OBJECT Q_PROPERTY(QQuickWebEngineSettings* settings READ settings CONSTANT FINAL) diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp index 7052afe42..afb0fbd25 100644 --- a/src/webengine/api/qquickwebengineview.cpp +++ b/src/webengine/api/qquickwebengineview.cpp @@ -2485,3 +2485,4 @@ void QQuickWebEngineTouchHandle::setOpacity(float opacity) QT_END_NAMESPACE +#include "moc_qquickwebengineview_p.cpp" diff --git a/src/webengine/api/qquickwebengineview_p.h b/src/webengine/api/qquickwebengineview_p.h index ab84b2600..b0203cfa8 100644 --- a/src/webengine/api/qquickwebengineview_p.h +++ b/src/webengine/api/qquickwebengineview_p.h @@ -51,10 +51,12 @@ // We mean it. // +#include <QtWebEngineCore/qtwebenginecoreglobal.h> #include <QtWebEngine/private/qtwebengineglobal_p.h> #include <QQuickItem> #include <QtGui/qcolor.h> +#include "qquickwebengineprofile.h" #include "qquickwebenginescript.h" QT_BEGIN_NAMESPACE @@ -74,7 +76,6 @@ class QQuickWebEngineJavaScriptDialogRequest; class QQuickWebEngineLoadRequest; class QQuickWebEngineNavigationRequest; class QQuickWebEngineNewViewRequest; -class QQuickWebEngineProfile; class QQuickWebEngineSettings; class QQuickWebEngineTooltipRequest; class QQuickWebEngineFormValidationMessageRequest; @@ -123,7 +124,9 @@ class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineView : public QQuickItem { Q_PROPERTY(QQuickWebEngineProfile *profile READ profile WRITE setProfile NOTIFY profileChanged FINAL REVISION 1) Q_PROPERTY(QQuickWebEngineSettings *settings READ settings REVISION 1 CONSTANT FINAL) Q_PROPERTY(QQuickWebEngineHistory *navigationHistory READ navigationHistory CONSTANT FINAL REVISION 1) +#if QT_CONFIG(webengine_webchannel) Q_PROPERTY(QQmlWebChannel *webChannel READ webChannel WRITE setWebChannel NOTIFY webChannelChanged REVISION 1 FINAL) +#endif Q_PROPERTY(QQmlListProperty<QQuickWebEngineScript> userScripts READ userScripts FINAL REVISION 1) Q_PROPERTY(bool activeFocusOnPress READ activeFocusOnPress WRITE setActiveFocusOnPress NOTIFY activeFocusOnPressChanged REVISION 2 FINAL) Q_PROPERTY(QColor backgroundColor READ backgroundColor WRITE setBackgroundColor NOTIFY backgroundColorChanged REVISION 2 FINAL) diff --git a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp index d5aae271f..cb41c8706 100644 --- a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp +++ b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp @@ -42,6 +42,7 @@ #include "qquickwebengineview_p.h" #include "qquickwebengineview_p_p.h" #include <QGuiApplication> +#include <QOpenGLContext> #include <QQuickPaintedItem> #include <QQuickWindow> #include <QSurfaceFormat> diff --git a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp index fdd6d1c4f..2c7cc83d1 100644 --- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp +++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp @@ -47,7 +47,6 @@ #include <QMouseEvent> #include <QOpenGLContext> #include <QResizeEvent> -#include <QSGAbstractRenderer> #include <QSGNode> #include <QWindow> #include <QtQuick/private/qquickwindow_p.h> diff --git a/tests/auto/quick/publicapi/tst_publicapi.cpp b/tests/auto/quick/publicapi/tst_publicapi.cpp index dad962576..e27eb7253 100644 --- a/tests/auto/quick/publicapi/tst_publicapi.cpp +++ b/tests/auto/quick/publicapi/tst_publicapi.cpp @@ -772,7 +772,9 @@ static const QStringList expectedAPI = QStringList() << "QQuickWebEngineView.url --> QUrl" << "QQuickWebEngineView.urlChanged() --> void" << "QQuickWebEngineView.userScripts --> QQmlListProperty<QQuickWebEngineScript>" +#if QT_CONFIG(webengine_webchannel) << "QQuickWebEngineView.webChannel --> QQmlWebChannel*" +#endif << "QQuickWebEngineView.webChannelChanged() --> void" << "QQuickWebEngineView.webChannelWorld --> uint" << "QQuickWebEngineView.webChannelWorldChanged(uint) --> void" diff --git a/tests/auto/quick/quick.pro b/tests/auto/quick/quick.pro index 865ec718e..285330460 100644 --- a/tests/auto/quick/quick.pro +++ b/tests/auto/quick/quick.pro @@ -18,5 +18,7 @@ qtConfig(webengine-testsupport) { qquickwebengineviewgraphics } +!qtHaveModule(quickcontrols): SUBDIRS -= qmltests + # QTBUG-66055 boot2qt: SUBDIRS -= inspectorserver qquickwebengineview qmltests qmltests2 diff --git a/tests/auto/widgets/accessibility/BLACKLIST b/tests/auto/widgets/accessibility/BLACKLIST new file mode 100644 index 000000000..41d3635d2 --- /dev/null +++ b/tests/auto/widgets/accessibility/BLACKLIST @@ -0,0 +1,2 @@ +[focusChild] +* diff --git a/tests/auto/widgets/origins/tst_origins.cpp b/tests/auto/widgets/origins/tst_origins.cpp index e3927f763..c4691ad74 100644 --- a/tests/auto/widgets/origins/tst_origins.cpp +++ b/tests/auto/widgets/origins/tst_origins.cpp @@ -41,7 +41,7 @@ #include <QtWebSockets/qwebsocketserver.h> #include <QtWebChannel/qwebchannel.h> #endif -#include <QtWidgets/qaction.h> +#include <qaction.h> #define QSL QStringLiteral #define QBAL QByteArrayLiteral diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp index a6b3e0905..098656390 100644 --- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp +++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp @@ -31,7 +31,6 @@ #include <QMenu> #include <QMimeDatabase> #include <QNetworkProxy> -#include <QOpenGLWidget> #include <QPaintEngine> #include <QPushButton> #include <QScreen> diff --git a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp index 5e16361c5..d5a2ecf49 100644 --- a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp +++ b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp @@ -29,8 +29,9 @@ #include <qwebengineview.h> #include <qwebenginepage.h> #include <qwebenginesettings.h> -#include <qnetworkrequest.h> +#include <qaction.h> #include <qdiriterator.h> +#include <qnetworkrequest.h> #include <qstackedlayout.h> #include <qtemporarydir.h> #include <QClipboard> @@ -45,7 +46,6 @@ #include <QTcpServer> #include <QTcpSocket> #include <QStyle> -#include <QtWidgets/qaction.h> #include <QWebEngineProfile> #include <QtCore/qregularexpression.h> |