diff options
-rw-r--r-- | .qmake.conf | 2 | ||||
-rw-r--r-- | Source/JavaScriptCore/LLIntOffsetsExtractor.pro | 2 | ||||
-rw-r--r-- | Source/JavaScriptCore/jsc.pro | 4 | ||||
-rw-r--r-- | Source/WTF/WTF.pri | 2 | ||||
-rw-r--r-- | Source/WebCore/Target.pri | 4 | ||||
-rw-r--r-- | Source/WebCore/WebCore.pri | 8 | ||||
-rw-r--r-- | Source/WebCore/platform/mac/WebCoreNSStringExtras.h | 2 | ||||
-rw-r--r-- | Source/WebKit/qt/declarative/experimental/experimental.pri | 2 | ||||
-rw-r--r-- | Source/WebKit/qt/declarative/experimental/plugin.cpp | 2 | ||||
-rw-r--r-- | Source/WebKit/qt/declarative/plugin.cpp | 2 | ||||
-rw-r--r-- | Source/WebKit/qt/declarative/public.pri | 2 | ||||
-rw-r--r-- | Source/WebKit2/UIProcess/qt/QtWebPageSGNode.cpp | 43 | ||||
-rw-r--r-- | Source/WebKit2/WebProcess.pro | 2 | ||||
-rw-r--r-- | Source/widgetsapi.pri | 4 | ||||
-rw-r--r-- | Tools/qmake/config.tests/icu/icu.pro | 2 | ||||
-rw-r--r-- | Tools/qmake/mkspecs/features/configure.prf | 5 | ||||
-rw-r--r-- | Tools/qmake/mkspecs/features/default_post.prf | 4 | ||||
-rw-r--r-- | Tools/qmake/mkspecs/features/default_pre.prf | 10 | ||||
-rw-r--r-- | Tools/qmake/mkspecs/features/features.prf | 17 | ||||
-rw-r--r-- | Tools/qmake/mkspecs/features/production_build.prf | 2 |
20 files changed, 78 insertions, 43 deletions
diff --git a/.qmake.conf b/.qmake.conf index 717d46d44..b6ffe6de4 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -3,4 +3,4 @@ MODULE_QMAKE_OUTDIR = $$shadowed($$PWD/Tools/qmake) QMAKEPATH += $$PWD/Tools/qmake $$MODULE_QMAKE_OUTDIR load(qt_build_config) -MODULE_VERSION = 5.7.1 +MODULE_VERSION = 5.8.0 diff --git a/Source/JavaScriptCore/LLIntOffsetsExtractor.pro b/Source/JavaScriptCore/LLIntOffsetsExtractor.pro index e522053d7..1d13d30e9 100644 --- a/Source/JavaScriptCore/LLIntOffsetsExtractor.pro +++ b/Source/JavaScriptCore/LLIntOffsetsExtractor.pro @@ -62,7 +62,7 @@ macx { DESTDIR = $$targetSubDir() llint.output = $$targetSubDir()/$$llint.output INCLUDEPATH += $$targetSubDir() - contains(QT_CONFIG, qt_framework) { + qtConfig(framework) { # Add framework headers directly to make #include <qglobal.h> work INCLUDEPATH += $$QT.core.libs/QtCore.framework/Headers # Extend framework search path to make #include <QtCore/qconfig.h> work diff --git a/Source/JavaScriptCore/jsc.pro b/Source/JavaScriptCore/jsc.pro index 4efe024d6..77dc4414b 100644 --- a/Source/JavaScriptCore/jsc.pro +++ b/Source/JavaScriptCore/jsc.pro @@ -28,6 +28,6 @@ wince* { } # Prevent warnings about difference in visibility on Mac OS X -contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols -unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions +qtConfig(reduce_exports):CONFIG += hide_symbols +unix:qtConfig(reduce_relocations):CONFIG += bsymbolic_functions diff --git a/Source/WTF/WTF.pri b/Source/WTF/WTF.pri index 1f4866d66..69e4cd1f3 100644 --- a/Source/WTF/WTF.pri +++ b/Source/WTF/WTF.pri @@ -25,7 +25,7 @@ mac { LIBS += -licuin -licuuc -licudt } } - else:!contains(QT_CONFIG,no-pkg-config):packagesExist("icu-i18n"): PKGCONFIG *= icu-i18n + else:qtConfig(pkg-config):packagesExist("icu-i18n"): PKGCONFIG *= icu-i18n else:android: LIBS += -licui18n -licuuc else: LIBS += -licui18n -licuuc -licudata } diff --git a/Source/WebCore/Target.pri b/Source/WebCore/Target.pri index e525aa1fc..32552953e 100644 --- a/Source/WebCore/Target.pri +++ b/Source/WebCore/Target.pri @@ -4196,8 +4196,8 @@ use?(3D_GRAPHICS) { INCLUDEPATH += $$PWD/platform/graphics/gpu - contains(QT_CONFIG, opengl) { - contains(QT_CONFIG, opengles2) { + qtConfig(opengl) { + qtConfig(opengles2) { SOURCES += \ platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp \ platform/graphics/opengl/Extensions3DOpenGLES.cpp diff --git a/Source/WebCore/WebCore.pri b/Source/WebCore/WebCore.pri index 37cde573a..26e9b8424 100644 --- a/Source/WebCore/WebCore.pri +++ b/Source/WebCore/WebCore.pri @@ -210,8 +210,8 @@ use?(3D_GRAPHICS) { win32: { mingw: { # Make sure OpenGL libs are after the webcore lib so MinGW can resolve symbols - contains(QT_CONFIG, opengles2) { - CONFIG(debug, debug|release):contains(QT_CONFIG, angle) { + qtConfig(opengles2) { + CONFIG(debug, debug|release):qtConfig(angle) { LIBS += $$QMAKE_LIBS_OPENGL_ES2_DEBUG } else { LIBS += $$QMAKE_LIBS_OPENGL_ES2 @@ -221,7 +221,7 @@ use?(3D_GRAPHICS) { } } } else { - contains(QT_CONFIG, opengles2): CONFIG += egl + qtConfig(opengles2): CONFIG += egl } } @@ -234,7 +234,7 @@ use?(GRAPHICS_SURFACE) { } have?(sqlite3) { - osx|contains(QT_CONFIG, no-pkg-config) { + osx|!qtConfig(pkg-config) { LIBS += -lsqlite3 } else { PKGCONFIG += sqlite3 diff --git a/Source/WebCore/platform/mac/WebCoreNSStringExtras.h b/Source/WebCore/platform/mac/WebCoreNSStringExtras.h index a2a0e9316..750fd67d0 100644 --- a/Source/WebCore/platform/mac/WebCoreNSStringExtras.h +++ b/Source/WebCore/platform/mac/WebCoreNSStringExtras.h @@ -32,7 +32,7 @@ #include <Foundation/Foundation.h> @class NSString; #else -typedef struct NSString NSString; +typedef struct objc_object NSString; #endif #ifdef __cplusplus diff --git a/Source/WebKit/qt/declarative/experimental/experimental.pri b/Source/WebKit/qt/declarative/experimental/experimental.pri index c4d7002e4..ed3d21b1f 100644 --- a/Source/WebKit/qt/declarative/experimental/experimental.pri +++ b/Source/WebKit/qt/declarative/experimental/experimental.pri @@ -17,7 +17,7 @@ CONFIG += plugin COPIES += cpqmldir } -contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols +qtConfig(reduce_exports):CONFIG += hide_symbols wince*:LIBS += $$QMAKE_LIBS_GUI diff --git a/Source/WebKit/qt/declarative/experimental/plugin.cpp b/Source/WebKit/qt/declarative/experimental/plugin.cpp index e6ffeda6e..66343af7c 100644 --- a/Source/WebKit/qt/declarative/experimental/plugin.cpp +++ b/Source/WebKit/qt/declarative/experimental/plugin.cpp @@ -45,7 +45,7 @@ public: class WebKitQmlExperimentalExtensionPlugin: public QQmlExtensionPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface" FILE "plugin.json") + Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid FILE "plugin.json") public: virtual void registerTypes(const char* uri) { diff --git a/Source/WebKit/qt/declarative/plugin.cpp b/Source/WebKit/qt/declarative/plugin.cpp index 1aa00a900..2ffc8ea0f 100644 --- a/Source/WebKit/qt/declarative/plugin.cpp +++ b/Source/WebKit/qt/declarative/plugin.cpp @@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE class WebKitQmlPlugin : public QQmlExtensionPlugin { - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface" FILE "plugin.json") + Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid FILE "plugin.json") Q_OBJECT public: #if defined(HAVE_WEBKIT2) diff --git a/Source/WebKit/qt/declarative/public.pri b/Source/WebKit/qt/declarative/public.pri index 3c7d07a05..6c3c2d404 100644 --- a/Source/WebKit/qt/declarative/public.pri +++ b/Source/WebKit/qt/declarative/public.pri @@ -17,7 +17,7 @@ CONFIG += plugin COPIES += cpqmldir } -contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols +qtConfig(reduce_exports):CONFIG += hide_symbols wince*:LIBS += $$QMAKE_LIBS_GUI diff --git a/Source/WebKit2/UIProcess/qt/QtWebPageSGNode.cpp b/Source/WebKit2/UIProcess/qt/QtWebPageSGNode.cpp index 002d00507..9a7b34951 100644 --- a/Source/WebKit2/UIProcess/qt/QtWebPageSGNode.cpp +++ b/Source/WebKit2/UIProcess/qt/QtWebPageSGNode.cpp @@ -27,7 +27,12 @@ #include <QtQuick/QSGSimpleRectNode> #include <WebCore/CoordinatedGraphicsScene.h> #include <WebCore/TransformationMatrix.h> -#include <private/qsgrendernode_p.h> + +#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0) +#include <QtQuick/QSGRenderNode> +#else +#include <QtQuick/private/qsgrendernode_p.h> +#endif using namespace WebCore; @@ -41,12 +46,33 @@ public: coordinatedGraphicsScene()->setActive(true); } - virtual StateFlags changedStates() +#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0) + + StateFlags changedStates() const override + { + return StateFlags(StencilState) | ColorState | BlendState; + } + + void render(const RenderState* state) override + { + renderInternal(state->projectionMatrix()); + } + +#else + + StateFlags changedStates() Q_DECL_OVERRIDE { return StateFlags(StencilState) | ColorState | BlendState; } - virtual void render(const RenderState& state) + void render(const RenderState& state) Q_DECL_OVERRIDE + { + renderInternal(state.projectionMatrix); + } + +#endif // QT_VERSION >= QT_VERSION_CHECK(5, 8, 0) + + void renderInternal(const QMatrix4x4* projection) { TransformationMatrix renderMatrix; if (pageNode()->devicePixelRatio() != 1.0) { @@ -58,18 +84,25 @@ public: // When rendering to an intermediate surface, Qt will // mirror the projection matrix to fit on the destination coordinate system. - const QMatrix4x4* projection = state.projectionMatrix; bool mirrored = projection && (*projection)(0, 0) * (*projection)(1, 1) - (*projection)(0, 1) * (*projection)(1, 0) > 0; // FIXME: Support non-rectangular clippings. coordinatedGraphicsScene()->paintToCurrentGLContext(renderMatrix, inheritedOpacity(), clipRect(), mirrored ? TextureMapper::PaintingMirrored : 0); } - ~ContentsSGNode() + void releaseResources() +#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0) + override +#endif { coordinatedGraphicsScene()->purgeGLResources(); } + ~ContentsSGNode() + { + releaseResources(); + } + const QtWebPageSGNode* pageNode() const { const QtWebPageSGNode* parent = static_cast<QtWebPageSGNode*>(this->parent()); diff --git a/Source/WebKit2/WebProcess.pro b/Source/WebKit2/WebProcess.pro index d401dc23a..0de2a6b53 100644 --- a/Source/WebKit2/WebProcess.pro +++ b/Source/WebKit2/WebProcess.pro @@ -5,7 +5,7 @@ # ------------------------------------------------------------------- TEMPLATE = app -!build_pass:contains(QT_CONFIG, debug_and_release): CONFIG += release +!build_pass:qtConfig(debug_and_release): CONFIG += release TARGET = QtWebProcess DESTDIR = $${ROOT_BUILD_DIR}/bin diff --git a/Source/widgetsapi.pri b/Source/widgetsapi.pri index 5c0ad57fc..ae1dacb8a 100644 --- a/Source/widgetsapi.pri +++ b/Source/widgetsapi.pri @@ -142,11 +142,11 @@ HEADERS += \ $$PWD/WebKit/qt/WidgetSupport/QStyleFacadeImp.h \ $$PWD/WebKit/qt/WidgetSupport/QWidgetPluginImpl.h \ -!contains(QT_CONFIG, static) { +!qtConfig(static) { HEADERS += $$PWD/WebKit/qt/Api/qwebkitplatformplugin.h } -contains(QT_CONFIG, accessibility) { +qtConfig(accessibility) { SOURCES += $$PWD/WebKit/qt/WidgetApi/qwebviewaccessible.cpp HEADERS += $$PWD/WebKit/qt/WidgetApi/qwebviewaccessible_p.h } diff --git a/Tools/qmake/config.tests/icu/icu.pro b/Tools/qmake/config.tests/icu/icu.pro index ce3780a33..212b7d70e 100644 --- a/Tools/qmake/config.tests/icu/icu.pro +++ b/Tools/qmake/config.tests/icu/icu.pro @@ -13,7 +13,7 @@ win32 { } else { LIBS += -licuin -licuuc -licudt } -} else:!contains(QT_CONFIG,no-pkg-config):packagesExist("icu-i18n") { +} else:qtConfig(pkg-config):packagesExist("icu-i18n") { PKGCONFIG += icu-i18n } else { LIBS += -licui18n -licuuc -licudata diff --git a/Tools/qmake/mkspecs/features/configure.prf b/Tools/qmake/mkspecs/features/configure.prf index b5fb2aed8..9eeac75dc 100644 --- a/Tools/qmake/mkspecs/features/configure.prf +++ b/Tools/qmake/mkspecs/features/configure.prf @@ -129,10 +129,11 @@ defineTest(finalizeConfigure) { production_build:android { addReasonForSkippingBuild("Build not supported on Android.") } - production_build:contains(QT_CONFIG, mirclient) { + QT_FOR_CONFIG += gui-private + production_build:qtConfig(mirclient) { addReasonForSkippingBuild("Build not supported on Ubuntu Touch.") } - !gnu_thin_archives:!win32-msvc2013:!mingw:contains(QT_CONFIG, static) { + !gnu_thin_archives:!win32-msvc2013:!mingw:qtConfig(static) { addReasonForSkippingBuild("QtWebKit cannot be built as a static library on this platform. Check your configuration in qtbase/config.summary.") } winrt: addReasonForSkippingBuild("QtWebKit is not supported on Windows Phone/Windows RT") diff --git a/Tools/qmake/mkspecs/features/default_post.prf b/Tools/qmake/mkspecs/features/default_post.prf index 19313d087..77375c667 100644 --- a/Tools/qmake/mkspecs/features/default_post.prf +++ b/Tools/qmake/mkspecs/features/default_post.prf @@ -285,8 +285,8 @@ contains(TEMPLATE, lib) { DEFINES += QT_ASCII_CAST_WARNINGS !plugin { - contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols - unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions + qtConfig(reduce_exports):CONFIG += hide_symbols + unix:qtConfig(reduce_relocations):CONFIG += bsymbolic_functions } } diff --git a/Tools/qmake/mkspecs/features/default_pre.prf b/Tools/qmake/mkspecs/features/default_pre.prf index 221937e85..6bb52d05a 100644 --- a/Tools/qmake/mkspecs/features/default_pre.prf +++ b/Tools/qmake/mkspecs/features/default_pre.prf @@ -64,7 +64,7 @@ else: PYTHON = python # We use private_tests to detect developer build, since the destdir will # always be our webkit build dir. This might change as configure changes. -contains(QT_CONFIG, private_tests): CONFIG += qt_developer_build +qtConfig(private_tests): CONFIG += qt_developer_build # By default we enable "production build", and build-webkit, which is # used by bots and developers, will disable it, to enable warnings etc. @@ -92,7 +92,7 @@ CONFIG += include_webinspector # as the module will be linked with. This is particular important on mac # since otherwise the libraries can be compiled against libstdc++, but # linked against libc++. -contains(QT_CONFIG, c++11): CONFIG += c++11 +qtConfig(c++11): CONFIG += c++11 # Limit the creation of thin archives to Linux, since only GNU's ar supports it. !debug_and_release:linux: CONFIG += gnu_thin_archives @@ -102,9 +102,9 @@ gcc:isEqual(QT_ARCH, "arm"): CONFIG -= use_gold_linker # Pick up Qt's defaults for debug/release/debug_and_release if(win32|mac):!macx-xcode { - contains(QT_CONFIG, simulator_and_device): CONFIG += simulator_and_device - contains(QT_CONFIG, debug_and_release): CONFIG += debug_and_release - contains(QT_CONFIG, build_all): CONFIG += build_all + qtConfig(simulator_and_device): CONFIG += simulator_and_device + qtConfig(debug_and_release): CONFIG += debug_and_release + qtConfig(build_all): CONFIG += build_all } FLEX = flex diff --git a/Tools/qmake/mkspecs/features/features.prf b/Tools/qmake/mkspecs/features/features.prf index 21286be2e..328a8be7e 100644 --- a/Tools/qmake/mkspecs/features/features.prf +++ b/Tools/qmake/mkspecs/features/features.prf @@ -48,17 +48,18 @@ defineTest(detectFeatures) { # We can't use Qt's 3rdparty sources for libjpeg and libpng outside of qtbase, but if Qt # is using the system libraries, use them to take advantage of the WebCore image decoders as well. - contains(QT_CONFIG, system-jpeg): WEBKIT_CONFIG += use_libjpeg + QT_FOR_CONFIG += gui-private + qtConfig(system-jpeg): WEBKIT_CONFIG += use_libjpeg else: CONFIGURE_WARNINGS += "Qt not configured to use system libjpeg, QImageDecoder will decode JPEG images" - contains(QT_CONFIG, system-png): WEBKIT_CONFIG += use_libpng + qtConfig(system-png): WEBKIT_CONFIG += use_libpng else: CONFIGURE_WARNINGS += "Qt not configured to use system libpng, QImageDecoder will decode PNG images" linux-* { config_libXcomposite: WEBKIT_CONFIG += have_xcomposite config_libXrender: WEBKIT_CONFIG += have_xrender - config_glx:!contains(QT_CONFIG, opengles2): WEBKIT_CONFIG += have_glx + config_glx:!qtConfig(opengles2): WEBKIT_CONFIG += have_glx # We need fontconfig to set up the test fonts for DumpRenderTree and WebKitTestRunner. config_fontconfig: WEBKIT_CONFIG += have_fontconfig @@ -85,7 +86,7 @@ defineTest(detectFeatures) { # Enable the USE(3D_GRAPHICS) flag when QtOpenGL is enabled. # Disable on Windows CE for now, as ANGLE won't compile. - !wince*:contains(QT_CONFIG, opengl): WEBKIT_CONFIG += use_3d_graphics + !wince*:qtConfig(opengl): WEBKIT_CONFIG += use_3d_graphics # Temporarily disable FTPDIR on Windows CE (missing functions from time.h) wince* { @@ -96,10 +97,10 @@ defineTest(detectFeatures) { use?(3d_graphics): WEBKIT_CONFIG += webgl # Both desktop and GLES2 support (only on Windows at this point) - contains(QT_CONFIG, dynamicgl): WEBKIT_CONFIG += have_dynamicgl + qtConfig(dynamicgl): WEBKIT_CONFIG += have_dynamicgl # HTML5 Media Support for builds with GStreamer - unix:!mac:!contains(QT_CONFIG, no-pkg-config) { + unix:!mac:qtConfig(pkg-config) { packagesExist("glib-2.0 gio-2.0 gstreamer-1.0 gstreamer-plugins-base-1.0") { WEBKIT_CONFIG += video use_gstreamer } else: packagesExist("glib-2.0 gio-2.0 \'gstreamer-0.10 >= 0.10.30\' \'gstreamer-plugins-base-0.10 >= 0.10.30\'") { @@ -117,7 +118,7 @@ defineTest(detectFeatures) { } # Try to use an system wide SQlite installation - if(!contains(QT_CONFIG, no-pkg-config):packagesExist("sqlite3"))|config_libsqlite3 { + if(qtConfig(pkg-config):packagesExist("sqlite3"))|config_libsqlite3 { WEBKIT_CONFIG += have_sqlite3 } else { SQLITE3SRCDIR = $$(SQLITE3SRCDIR) @@ -132,7 +133,7 @@ defineTest(detectFeatures) { # FIXME: GraphicsSurface do not work with dynamicgl at this point. use?(3d_graphics):!have?(dynamicgl) { mac: WEBKIT_CONFIG += use_graphics_surface - win32:contains(QT_CONFIG, opengles2): WEBKIT_CONFIG += use_graphics_surface + win32:qtConfig(opengles2): WEBKIT_CONFIG += use_graphics_surface have?(glx):have?(xcomposite):have?(xrender): WEBKIT_CONFIG += use_graphics_surface use_glx } diff --git a/Tools/qmake/mkspecs/features/production_build.prf b/Tools/qmake/mkspecs/features/production_build.prf index 903600338..4068a9a70 100644 --- a/Tools/qmake/mkspecs/features/production_build.prf +++ b/Tools/qmake/mkspecs/features/production_build.prf @@ -7,7 +7,7 @@ CONFIG *= use_all_in_one_files # resulting in the need of several gigabytes of memory at link-time. Reduce the pressure # by compiling any static library like WTF or JSC with release flags instead and keep debug # symbols for the static libraries that implement API. -if(linux-*:!contains(QMAKE_HOST.arch, x86_64))|mingw:if(CONFIG(debug, debug|release)|contains(QT_CONFIG,separate_debug_info)):contains(TEMPLATE, lib):staticlib { +if(linux-*:!contains(QMAKE_HOST.arch, x86_64))|mingw:if(CONFIG(debug, debug|release)|qtConfig(separate_debug_info)):contains(TEMPLATE, lib):staticlib { !equals(TARGET, WebKit2):!equals(TARGET, WebKitWidgets) { CONFIG += no_debug_info CONFIG -= separate_debug_info |