From 3215168f0dc1dee1064d9063b2748e64cc2577bc Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 4 Dec 2020 17:01:26 +0100 Subject: Fix building against 5.12 on most CIs Change-Id: I4c4bbc75b9f6346a446f8094f669d142f76c164a Reviewed-by: Kirill Burtsev --- configure.pri | 13 ++++++++++--- src/pdf/config/ios.pri | 1 + src/pdf/configure.json | 2 +- .../quick/qquickwebengineview/tst_qquickwebengineview.cpp | 5 +++++ tests/auto/quick/quick.pro | 2 ++ tests/auto/widgets/accessibility/tst_accessibility.cpp | 3 +++ tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp | 4 ++++ 7 files changed, 26 insertions(+), 4 deletions(-) diff --git a/configure.pri b/configure.pri index d3ba9b147..e4d04a898 100644 --- a/configure.pri +++ b/configure.pri @@ -461,10 +461,17 @@ defineTest(qtwebengine_isMacOsPlatformSupported) { defineTest(qtwebengine_isGCCVersionSupported) { # Keep in sync with src/webengine/doc/src/qtwebengine-platform-notes.qdoc - greaterThan(QMAKE_GCC_MAJOR_VERSION, 4):return(true) + lessThan(QMAKE_GCC_MAJOR_VERSION, 5) { + qtwebengine_platformError("requires at least gcc version 5, but using gcc version $${QMAKE_GCC_MAJOR_VERSION}.$${QMAKE_GCC_MINOR_VERSION}.") + return(false) + } - qtwebengine_platformError("requires at least gcc version 5, but using gcc version $${QMAKE_GCC_MAJOR_VERSION}.$${QMAKE_GCC_MINOR_VERSION}.") - return(false) + equals(QMAKE_GCC_MAJOR_VERSION, 5): equals(QMAKE_GCC_MINOR_VERSION, 4): equals(QMAKE_GCC_PATCH_VERSION, 0) { + qtwebengine_platformError("gcc version 5.4.0 is blacklisted due to internal compiler errors.") + return(false) + } + + return(true) } defineTest(qtwebengine_isBuildingOnWin32) { diff --git a/src/pdf/config/ios.pri b/src/pdf/config/ios.pri index 1dcbeffde..cd7597d85 100644 --- a/src/pdf/config/ios.pri +++ b/src/pdf/config/ios.pri @@ -37,6 +37,7 @@ clang_base_path=\"$${clang_dir}\" \ ios_enable_code_signing=false \ target_os=\"ios\" \ ios_deployment_target=\"$${QMAKE_IOS_DEPLOYMENT_TARGET}\" \ +mac_sdk_min=\"$${QMAKE_MAC_SDK_VERSION_MAJOR_MINOR}\" \ enable_ios_bitcode=true \ use_jumbo_build=false diff --git a/src/pdf/configure.json b/src/pdf/configure.json index ddc0e99dc..069893660 100644 --- a/src/pdf/configure.json +++ b/src/pdf/configure.json @@ -2,7 +2,7 @@ "module": "pdf", "depends" : [ "buildtools-private" ], "testDir": "../../config.tests", - "condition": "features.build-qtpdf && features.webengine-qtpdf-support", + "condition": "module.gui && features.webengine-qtpdf-support && features.build-qtpdf", "libraries": { }, "tests": { diff --git a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp index 5ee30f165..e879d9262 100644 --- a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp +++ b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp @@ -993,6 +993,7 @@ void tst_QQuickWebEngineView::inputEventForwardingDisabledWhenActiveFocusOnPress void tst_QQuickWebEngineView::changeLocale() { +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) QStringList errorLines; QUrl url("http://non.existent/"); @@ -1028,6 +1029,7 @@ void tst_QQuickWebEngineView::changeLocale() QTRY_VERIFY(!evaluateJavaScriptSync(viewDE.data(), "document.body.innerText").isNull()); errorLines = evaluateJavaScriptSync(viewDE.data(), "document.body.innerText").toString().split(QRegularExpression("[\r\n]"), Qt::SkipEmptyParts); QCOMPARE(errorLines.first().toUtf8(), QByteArrayLiteral("Die Website ist nicht erreichbar")); +#endif } void tst_QQuickWebEngineView::userScripts() @@ -1173,6 +1175,9 @@ void tst_QQuickWebEngineView::focusChild_data() void tst_QQuickWebEngineView::focusChild() { +#if QT_VERSION < QT_VERSION_CHECK(5, 14, 1) + QSKIP("Requires newer base Qt"); +#endif auto traverseToWebDocumentAccessibleInterface = [](QAccessibleInterface *iface) -> QAccessibleInterface * { QFETCH(QVector, ancestorRoles); for (int i = 0; i < ancestorRoles.size(); ++i) { diff --git a/tests/auto/quick/quick.pro b/tests/auto/quick/quick.pro index 41ea5c4c1..f02652ba1 100644 --- a/tests/auto/quick/quick.pro +++ b/tests/auto/quick/quick.pro @@ -20,5 +20,7 @@ qtConfig(webengine-testsupport) { qtConfig(ssl): SUBDIRS += qmltests_ssl +lessThan(QT_MAJOR_VERSION, 6):lessThan(QT_MINOR_VERSION, 14): SUBDIRS -= qmltests qmltests2 qmltests_ssl + # QTBUG-66055 boot2qt: SUBDIRS -= inspectorserver qquickwebengineview qmltests qmltests2 diff --git a/tests/auto/widgets/accessibility/tst_accessibility.cpp b/tests/auto/widgets/accessibility/tst_accessibility.cpp index 84382d6f1..0c235382a 100644 --- a/tests/auto/widgets/accessibility/tst_accessibility.cpp +++ b/tests/auto/widgets/accessibility/tst_accessibility.cpp @@ -160,6 +160,9 @@ void tst_Accessibility::focusChild_data() void tst_Accessibility::focusChild() { +#if QT_VERSION < QT_VERSION_CHECK(5, 14, 1) + QSKIP("Requires newer base Qt"); +#endif auto traverseToWebDocumentAccessibleInterface = [](QAccessibleInterface *iface) -> QAccessibleInterface * { QFETCH(QVector, ancestorRoles); for (int i = 0; i < ancestorRoles.size(); ++i) { diff --git a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp index 2257a6f4e..afc0750cd 100644 --- a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp +++ b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp @@ -1160,6 +1160,7 @@ void tst_QWebEngineView::doNotBreakLayout() void tst_QWebEngineView::changeLocale() { +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) QStringList errorLines; QUrl url("http://non.existent/"); @@ -1195,6 +1196,7 @@ void tst_QWebEngineView::changeLocale() QTRY_VERIFY(!toPlainTextSync(viewDE.page()).isEmpty()); errorLines = toPlainTextSync(viewDE.page()).split(QRegularExpression("[\r\n]"), Qt::SkipEmptyParts); QCOMPARE(errorLines.first().toUtf8(), QByteArrayLiteral("Die Website ist nicht erreichbar")); +#endif } void tst_QWebEngineView::inputMethodsTextFormat_data() @@ -1480,6 +1482,7 @@ void tst_QWebEngineView::mouseClick() void tst_QWebEngineView::postData() { +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) QMap postData; // use reserved characters to make the test harder to pass postData[QStringLiteral("Spä=m")] = QStringLiteral("ëgg:s"); @@ -1607,6 +1610,7 @@ void tst_QWebEngineView::postData() timeoutGuard.stop(); server.close(); +#endif } void tst_QWebEngineView::inputFieldOverridesShortcuts() -- cgit v1.2.3