diff options
82 files changed, 204 insertions, 146 deletions
diff --git a/.qmake.conf b/.qmake.conf index d541a105a..e3e2fa6e7 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.4.3 +MODULE_VERSION = 5.5.0 diff --git a/LICENSE.GPLv2 b/LICENSE.GPLv2 index 194c39cb6..6dbb032fd 100644 --- a/LICENSE.GPLv2 +++ b/LICENSE.GPLv2 @@ -1,7 +1,7 @@ GNU GENERAL PUBLIC LICENSE - The Qt Toolkit is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). - Contact: http://www.qt-project.org/legal + The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd. + Contact: http://www.qt.io/licensing/ You may use, distribute and copy the Qt GUI Toolkit under the terms of GNU General Public License version 2, which is displayed below. diff --git a/LICENSE.LGPLv21 b/LICENSE.LGPLv21 index 341aa9eea..6e1846112 100644 --- a/LICENSE.LGPLv21 +++ b/LICENSE.LGPLv21 @@ -1,7 +1,7 @@ GNU LESSER GENERAL PUBLIC LICENSE - The Qt Toolkit is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). - Contact: http://www.qt-project.org/legal + The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd. + Contact: http://www.qt.io/licensing/ You may use, distribute and copy the Qt GUI Toolkit under the terms of GNU Lesser General Public License version 2.1, which is displayed below. diff --git a/LICENSE.LGPLv3 b/LICENSE.LGPLv3 index aed671a0c..8fbb74390 100644 --- a/LICENSE.LGPLv3 +++ b/LICENSE.LGPLv3 @@ -1,7 +1,7 @@ GNU LESSER GENERAL PUBLIC LICENSE - The Qt Toolkit is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). - Contact: http://www.qt-project.org/legal + The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd. + Contact: http://www.qt.io/licensing/ You may use, distribute and copy the Qt GUI Toolkit under the terms of GNU Lesser General Public License version 3, which is displayed below. diff --git a/Source/JavaScriptCore/API/JSStringRefQt.cpp b/Source/JavaScriptCore/API/JSStringRefQt.cpp index 259bad8e6..c1ce761f7 100644 --- a/Source/JavaScriptCore/API/JSStringRefQt.cpp +++ b/Source/JavaScriptCore/API/JSStringRefQt.cpp @@ -1,6 +1,6 @@ /* * Copyright (C) 2006, 2007 Apple Computer, Inc. All rights reserved. - * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + * Copyright (C) 2015 The Qt Company Ltd. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/Source/JavaScriptCore/API/JSStringRefQt.h b/Source/JavaScriptCore/API/JSStringRefQt.h index 63a059fdb..b4f934a3b 100644 --- a/Source/JavaScriptCore/API/JSStringRefQt.h +++ b/Source/JavaScriptCore/API/JSStringRefQt.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2006, 2007 Apple Computer, Inc. All rights reserved. - * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + * Copyright (C) 2015 The Qt Company Ltd. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/Source/JavaScriptCore/assembler/ARMAssembler.h b/Source/JavaScriptCore/assembler/ARMAssembler.h index c950e47bb..19db71dc6 100644 --- a/Source/JavaScriptCore/assembler/ARMAssembler.h +++ b/Source/JavaScriptCore/assembler/ARMAssembler.h @@ -41,10 +41,10 @@ namespace JSC { r0 = 0, r1, r2, - r3, S0 = r3, /* Same as thumb assembler. */ + r3, r4, r5, - r6, + r6, S0 = r6, r7, r8, r9, diff --git a/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h b/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h index ac3cc8646..b7259810a 100644 --- a/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h +++ b/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h @@ -35,11 +35,8 @@ namespace JSC { class MacroAssemblerARMv7 : public AbstractMacroAssembler<ARMv7Assembler> { - // FIXME: switch dataTempRegister & addressTempRegister, or possibly use r7? - // - dTR is likely used more than aTR, and we'll get better instruction - // encoding if it's in the low 8 registers. static const RegisterID dataTempRegister = ARMRegisters::ip; - static const RegisterID addressTempRegister = ARMRegisters::r3; + static const RegisterID addressTempRegister = ARMRegisters::r6; static const ARMRegisters::FPDoubleRegisterID fpTempRegister = ARMRegisters::d7; inline ARMRegisters::FPSingleRegisterID fpTempRegisterAsSingle() { return ARMRegisters::asSingle(fpTempRegister); } diff --git a/Source/JavaScriptCore/dfg/DFGGPRInfo.h b/Source/JavaScriptCore/dfg/DFGGPRInfo.h index d889cf513..4b7aaee49 100644 --- a/Source/JavaScriptCore/dfg/DFGGPRInfo.h +++ b/Source/JavaScriptCore/dfg/DFGGPRInfo.h @@ -393,7 +393,7 @@ private: class GPRInfo { public: typedef GPRReg RegisterType; - static const unsigned numberOfRegisters = 8; + static const unsigned numberOfRegisters = 9; // Temporary registers. static const GPRReg regT0 = ARMRegisters::r0; @@ -404,6 +404,7 @@ public: static const GPRReg regT5 = ARMRegisters::r9; static const GPRReg regT6 = ARMRegisters::r10; static const GPRReg regT7 = ARMRegisters::r11; + static const GPRReg regT8 = ARMRegisters::r3; // These registers match the baseline JIT. static const GPRReg cachedResultRegister = regT0; static const GPRReg cachedResultRegister2 = regT1; @@ -412,11 +413,7 @@ public: static const GPRReg argumentGPR0 = ARMRegisters::r0; // regT0 static const GPRReg argumentGPR1 = ARMRegisters::r1; // regT1 static const GPRReg argumentGPR2 = ARMRegisters::r2; // regT2 - // FIXME: r3 is currently used be the MacroAssembler as a temporary - it seems - // This could threoretically be a problem if this is used in code generation - // between the arguments being set up, and the call being made. That said, - // any change introducing a problem here is likely to be immediately apparent! - static const GPRReg argumentGPR3 = ARMRegisters::r3; // FIXME! + static const GPRReg argumentGPR3 = ARMRegisters::r3; // regT8 static const GPRReg nonArgGPR0 = ARMRegisters::r4; // regT3 static const GPRReg nonArgGPR1 = ARMRegisters::r8; // regT4 static const GPRReg nonArgGPR2 = ARMRegisters::r9; // regT5 @@ -427,7 +424,7 @@ public: static GPRReg toRegister(unsigned index) { ASSERT(index < numberOfRegisters); - static const GPRReg registerForIndex[numberOfRegisters] = { regT0, regT1, regT2, regT3, regT4, regT5, regT6, regT7 }; + static const GPRReg registerForIndex[numberOfRegisters] = { regT0, regT1, regT2, regT3, regT4, regT5, regT6, regT7, regT8 }; return registerForIndex[index]; } @@ -435,7 +432,7 @@ public: { ASSERT(static_cast<unsigned>(reg) != InvalidGPRReg); ASSERT(static_cast<unsigned>(reg) < 16); - static const unsigned indexForRegister[16] = { 0, 1, 2, InvalidIndex, 3, InvalidIndex, InvalidIndex, InvalidIndex, 4, 5, 6, 7, InvalidIndex, InvalidIndex, InvalidIndex, InvalidIndex }; + static const unsigned indexForRegister[16] = { 0, 1, 2, 8, 3, InvalidIndex, InvalidIndex, InvalidIndex, 4, 5, 6, 7, InvalidIndex, InvalidIndex, InvalidIndex, InvalidIndex }; unsigned result = indexForRegister[reg]; ASSERT(result != InvalidIndex); return result; diff --git a/Source/JavaScriptCore/jit/JITStubs.cpp b/Source/JavaScriptCore/jit/JITStubs.cpp index 7aaa27867..9be418e56 100644 --- a/Source/JavaScriptCore/jit/JITStubs.cpp +++ b/Source/JavaScriptCore/jit/JITStubs.cpp @@ -653,7 +653,6 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n" "str r11, [sp, #" STRINGIZE_VALUE_OF(PRESERVED_R11_OFFSET) "]" "\n" "str r1, [sp, #" STRINGIZE_VALUE_OF(REGISTER_FILE_OFFSET) "]" "\n" "mov r5, r2" "\n" - "mov r6, #512" "\n" "blx r0" "\n" "ldr r11, [sp, #" STRINGIZE_VALUE_OF(PRESERVED_R11_OFFSET) "]" "\n" "ldr r10, [sp, #" STRINGIZE_VALUE_OF(PRESERVED_R10_OFFSET) "]" "\n" @@ -730,7 +729,6 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n" "stmdb sp!, {r4-r6, r8-r11, lr}" "\n" "sub sp, sp, #" STRINGIZE_VALUE_OF(PRESERVEDR4_OFFSET) "\n" "mov r5, r2" "\n" - "mov r6, #512" "\n" // r0 contains the code "blx r0" "\n" "add sp, sp, #" STRINGIZE_VALUE_OF(PRESERVEDR4_OFFSET) "\n" @@ -780,7 +778,6 @@ __asm EncodedJSValue ctiTrampoline(void*, JSStack*, CallFrame*, void* /*unused1* str r11, [sp, # PRESERVED_R11_OFFSET ] str r1, [sp, # REGISTER_FILE_OFFSET ] mov r5, r2 - mov r6, #512 blx r0 ldr r11, [sp, # PRESERVED_R11_OFFSET ] ldr r10, [sp, # PRESERVED_R10_OFFSET ] @@ -840,7 +837,6 @@ __asm EncodedJSValue ctiTrampoline(void*, JSStack*, CallFrame*, void* /*unused1* stmdb sp!, {r4-r6, r8-r11, lr} sub sp, sp, # PRESERVEDR4_OFFSET mov r5, r2 - mov r6, #512 mov lr, pc bx r0 add sp, sp, # PRESERVEDR4_OFFSET @@ -1387,7 +1383,6 @@ MSVC_BEGIN( stmdb sp!, {r1-r3}) MSVC_BEGIN( stmdb sp!, {r4-r6, r8-r11, lr}) MSVC_BEGIN( sub sp, sp, #68 ; sync with PRESERVEDR4_OFFSET) MSVC_BEGIN( mov r5, r2) -MSVC_BEGIN( mov r6, #512) MSVC_BEGIN( ; r0 contains the code) MSVC_BEGIN( mov lr, pc) MSVC_BEGIN( bx r0) diff --git a/Source/JavaScriptCore/jit/JITStubsMSVC64.asm b/Source/JavaScriptCore/jit/JITStubsMSVC64.asm index 4a00e0d14..054214153 100644 --- a/Source/JavaScriptCore/jit/JITStubsMSVC64.asm +++ b/Source/JavaScriptCore/jit/JITStubsMSVC64.asm @@ -1,5 +1,5 @@ ;/* -; Copyright (C) 2013 Digia Plc. and/or its subsidiary(-ies) +; Copyright (C) 2015 The Qt Company Ltd ; ; Redistribution and use in source and binary forms, with or without ; modification, are permitted provided that the following conditions diff --git a/Source/JavaScriptCore/offlineasm/x86.rb b/Source/JavaScriptCore/offlineasm/x86.rb index 5e040ba76..ac433f36b 100644 --- a/Source/JavaScriptCore/offlineasm/x86.rb +++ b/Source/JavaScriptCore/offlineasm/x86.rb @@ -1,5 +1,5 @@ # Copyright (C) 2012 Apple Inc. All rights reserved. -# Copyright (C) 2013 Digia Plc. and/or its subsidiary(-ies) +# Copyright (C) 2015 The Qt Company Ltd # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions diff --git a/Source/JavaScriptCore/runtime/PropertyDescriptor.cpp b/Source/JavaScriptCore/runtime/PropertyDescriptor.cpp index 14b42fd9a..0b93b6ce1 100644 --- a/Source/JavaScriptCore/runtime/PropertyDescriptor.cpp +++ b/Source/JavaScriptCore/runtime/PropertyDescriptor.cpp @@ -183,9 +183,9 @@ bool sameValue(ExecState* exec, JSValue a, JSValue b) bool PropertyDescriptor::equalTo(ExecState* exec, const PropertyDescriptor& other) const { - if (!other.m_value == m_value || - !other.m_getter == m_getter || - !other.m_setter == m_setter) + if (other.m_value.isEmpty() != m_value.isEmpty() || + other.m_getter.isEmpty() != m_getter.isEmpty() || + other.m_setter.isEmpty() != m_setter.isEmpty()) return false; return (!m_value || sameValue(exec, other.m_value, m_value)) && (!m_getter || JSValue::strictEqual(exec, other.m_getter, m_getter)) diff --git a/Source/JavaScriptCore/yarr/YarrJIT.cpp b/Source/JavaScriptCore/yarr/YarrJIT.cpp index 1b2b03131..d337cf797 100644 --- a/Source/JavaScriptCore/yarr/YarrJIT.cpp +++ b/Source/JavaScriptCore/yarr/YarrJIT.cpp @@ -46,10 +46,10 @@ class YarrGenerator : private MacroAssembler { static const RegisterID input = ARMRegisters::r0; static const RegisterID index = ARMRegisters::r1; static const RegisterID length = ARMRegisters::r2; - static const RegisterID output = ARMRegisters::r4; + static const RegisterID output = ARMRegisters::r3; - static const RegisterID regT0 = ARMRegisters::r5; - static const RegisterID regT1 = ARMRegisters::r6; + static const RegisterID regT0 = ARMRegisters::r4; + static const RegisterID regT1 = ARMRegisters::r5; static const RegisterID returnRegister = ARMRegisters::r0; static const RegisterID returnRegister2 = ARMRegisters::r1; @@ -2553,11 +2553,6 @@ class YarrGenerator : private MacroAssembler { push(ARMRegisters::r4); push(ARMRegisters::r5); push(ARMRegisters::r6); -#if CPU(ARM_TRADITIONAL) - push(ARMRegisters::r8); // scratch register -#endif - if (compileMode == IncludeSubpatterns) - move(ARMRegisters::r3, output); #elif CPU(SH4) push(SH4Registers::r11); push(SH4Registers::r13); @@ -2583,9 +2578,6 @@ class YarrGenerator : private MacroAssembler { pop(X86Registers::ebx); pop(X86Registers::ebp); #elif CPU(ARM) -#if CPU(ARM_TRADITIONAL) - pop(ARMRegisters::r8); // scratch register -#endif pop(ARMRegisters::r6); pop(ARMRegisters::r5); pop(ARMRegisters::r4); diff --git a/Source/ThirdParty/leveldb/port/port_qt.h b/Source/ThirdParty/leveldb/port/port_qt.h index 556e00368..dbb5210d5 100644 --- a/Source/ThirdParty/leveldb/port/port_qt.h +++ b/Source/ThirdParty/leveldb/port/port_qt.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2014 Digia Plc. and/or its subsidiary(-ies) + Copyright (C) 2015 The Qt Company Ltd This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/Source/ThirdParty/leveldb/util/env_qt.cc b/Source/ThirdParty/leveldb/util/env_qt.cc index b9a7b18a8..f1a290816 100644 --- a/Source/ThirdParty/leveldb/util/env_qt.cc +++ b/Source/ThirdParty/leveldb/util/env_qt.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2014 Digia Plc. and/or its subsidiary(-ies) + Copyright (C) 2015 The Qt Company Ltd This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/Source/ThirdParty/leveldb/util/qt_logger.h b/Source/ThirdParty/leveldb/util/qt_logger.h index e673fd5de..0934c478a 100644 --- a/Source/ThirdParty/leveldb/util/qt_logger.h +++ b/Source/ThirdParty/leveldb/util/qt_logger.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2014 Digia Plc. and/or its subsidiary(-ies) + Copyright (C) 2015 The Qt Company Ltd This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/Source/WTF/wtf/SaturatedArithmetic.h b/Source/WTF/wtf/SaturatedArithmetic.h index cf9e8e17e..194fc88ba 100644 --- a/Source/WTF/wtf/SaturatedArithmetic.h +++ b/Source/WTF/wtf/SaturatedArithmetic.h @@ -43,7 +43,7 @@ inline int32_t saturatedAddition(int32_t a, int32_t b) // Can only overflow if the signed bit of the two values match. If the signed // bit of the result and one of the values differ it did overflow. - if (!((ua ^ ub) >> 31) & (result ^ ua) >> 31) + if (~((ua ^ ub) >> 31) & (result ^ ua) >> 31) result = std::numeric_limits<int>::max() + (ua >> 31); return result; diff --git a/Source/WebCore/css/mediaControlsQt.css b/Source/WebCore/css/mediaControlsQt.css index 5ed490f1b..c281fb667 100644 --- a/Source/WebCore/css/mediaControlsQt.css +++ b/Source/WebCore/css/mediaControlsQt.css @@ -3,7 +3,7 @@ * * Copyright (C) 2009, 2011 Apple Inc. All rights reserved. * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) - * Copyright (C) 2013 Digia Plc. and/or its subsidiary(-ies) + * Copyright (C) 2015 The Qt Company Ltd * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/Source/WebCore/page/AutoscrollController.cpp b/Source/WebCore/page/AutoscrollController.cpp index 7257ed49b..a5e3aaff2 100644 --- a/Source/WebCore/page/AutoscrollController.cpp +++ b/Source/WebCore/page/AutoscrollController.cpp @@ -1,7 +1,7 @@ /* * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org) - * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies) + * Copyright (C) 2015 The Qt Company Ltd * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp index c2a172a8d..fd9bb59aa 100644 --- a/Source/WebCore/page/EventHandler.cpp +++ b/Source/WebCore/page/EventHandler.cpp @@ -1,7 +1,7 @@ /* * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2013 Apple Inc. All rights reserved. * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org) - * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies) + * Copyright (C) 2015 The Qt Company Ltd * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/Source/WebCore/platform/graphics/ShadowBlur.cpp b/Source/WebCore/platform/graphics/ShadowBlur.cpp index 7458ea899..b366961f3 100644 --- a/Source/WebCore/platform/graphics/ShadowBlur.cpp +++ b/Source/WebCore/platform/graphics/ShadowBlur.cpp @@ -3,7 +3,7 @@ * Copyright (C) 2010 Sencha, Inc. All rights reserved. * Copyright (C) 2010 Igalia S.L. All rights reserved. * Copyright (C) Research In Motion Limited 2011. All rights reserved. - * Copyright (C) 2013 Digia Plc. and/or its subsidiary(-ies). + * Copyright (C) 2015 The Qt Company Ltd. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp b/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp index a6b7c8578..5ca686ec4 100644 --- a/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp +++ b/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp @@ -3,7 +3,7 @@ * Copyright (C) 2011 Google Inc. All rights reserved. * Copyright (C) 2012 ChangSeok Oh <shivamidow@gmail.com> * Copyright (C) 2012 Research In Motion Limited. All rights reserved. - * Copyright (C) 2014 Digia Plc. and/or its subsidiary(-ies). + * Copyright (C) 2015 The Qt Company Ltd. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/Source/WebCore/platform/graphics/qt/FontPlatformDataQt.cpp b/Source/WebCore/platform/graphics/qt/FontPlatformDataQt.cpp index 8e917402e..eecb96122 100644 --- a/Source/WebCore/platform/graphics/qt/FontPlatformDataQt.cpp +++ b/Source/WebCore/platform/graphics/qt/FontPlatformDataQt.cpp @@ -2,7 +2,7 @@ Copyright (C) 2008 Holger Hans Peter Freyther Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/ Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies) - Copyright (C) 2013 Digia Plc. and/or its subsidiary(-ies) + Copyright (C) 2015 The Qt Company Ltd This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -29,26 +29,54 @@ namespace WebCore { +// See http://www.w3.org/TR/css3-fonts/#font-weight-prop +#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0) static inline QFont::Weight toQFontWeight(FontWeight fontWeight) { switch (fontWeight) { case FontWeight100: + return QFont::Thin; case FontWeight200: - return QFont::Light; // QFont::Light == Weight of 25 + return QFont::ExtraLight; + case FontWeight300: + return QFont::Light; + case FontWeight400: + return QFont::Normal; + case FontWeight500: + return QFont::Medium; case FontWeight600: - return QFont::DemiBold; // QFont::DemiBold == Weight of 63 + return QFont::DemiBold; case FontWeight700: + return QFont::Bold; case FontWeight800: - return QFont::Bold; // QFont::Bold == Weight of 75 + return QFont::ExtraBold; case FontWeight900: - return QFont::Black; // QFont::Black == Weight of 87 + return QFont::Black; + } + Q_UNREACHABLE(); +} +#else +static inline QFont::Weight toQFontWeight(FontWeight fontWeight) +{ + switch (fontWeight) { + case FontWeight100: + case FontWeight200: case FontWeight300: + return QFont::Light; // QFont::Light == Weight of 25 case FontWeight400: case FontWeight500: - default: return QFont::Normal; // QFont::Normal == Weight of 50 + case FontWeight600: + return QFont::DemiBold; // QFont::DemiBold == Weight of 63 + case FontWeight700: + return QFont::Bold; // QFont::Bold == Weight of 75 + case FontWeight800: + case FontWeight900: + return QFont::Black; // QFont::Black == Weight of 87 } + Q_UNREACHABLE(); } +#endif static inline bool isEmptyValue(const float size, const bool bold, const bool oblique) { diff --git a/Source/WebCore/platform/graphics/qt/FontQt.cpp b/Source/WebCore/platform/graphics/qt/FontQt.cpp index ab11c5199..5ae9f25af 100644 --- a/Source/WebCore/platform/graphics/qt/FontQt.cpp +++ b/Source/WebCore/platform/graphics/qt/FontQt.cpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2012, 2014 Digia Plc. and/or its subsidiary(-ies) + Copyright (C) 2015 The Qt Company Ltd Copyright (C) 2008, 2010 Holger Hans Peter Freyther Copyright (C) 2009 Dirk Schulze <krit@webkit.org> diff --git a/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp b/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp index dffcfc637..43b546d18 100644 --- a/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp +++ b/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp @@ -383,6 +383,8 @@ void GraphicsContext3DPrivate::blitMultisampleFramebufferAndRestoreContext() bool GraphicsContext3DPrivate::makeCurrentIfNeeded() const { + if (!m_platformContext) + return false; const QOpenGLContext* currentContext = QOpenGLContext::currentContext(); if (currentContext == m_platformContext) return true; @@ -424,6 +426,7 @@ GraphicsContext3D::GraphicsContext3D(GraphicsContext3D::Attributes attrs, HostWi , m_multisampleFBO(0) , m_multisampleDepthStencilBuffer(0) , m_multisampleColorBuffer(0) + , m_functions(0) , m_private(adoptPtr(new GraphicsContext3DPrivate(this, hostWindow, renderStyle))) , m_compiler(isGLES2Compliant() ? SH_ESSL_OUTPUT : SH_GLSL_OUTPUT) { diff --git a/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp b/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp index 4cbf17a24..d183dd8ee 100644 --- a/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp +++ b/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp @@ -10,7 +10,7 @@ * Copyright (C) 2008 Dirk Schulze <vbs85@gmx.de> * Copyright (C) 2010, 2011 Sencha, Inc. * Copyright (C) 2011 Andreas Kling <kling@webkit.org> - * Copyright (C) 2013 Digia Plc. and/or its subsidiary(-ies). + * Copyright (C) 2015 The Qt Company Ltd. * * All rights reserved. * diff --git a/Source/WebCore/platform/graphics/qt/ImageBufferDataQt.cpp b/Source/WebCore/platform/graphics/qt/ImageBufferDataQt.cpp index aae31567f..43c6758e6 100644 --- a/Source/WebCore/platform/graphics/qt/ImageBufferDataQt.cpp +++ b/Source/WebCore/platform/graphics/qt/ImageBufferDataQt.cpp @@ -3,7 +3,7 @@ * Copyright (C) 2008 Holger Hans Peter Freyther * Copyright (C) 2009 Dirk Schulze <krit@webkit.org> * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved. - * Copyright (C) 2014 Digia Plc. and/or its subsidiary(-ies) + * Copyright (C) 2015 The Qt Company Ltd * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/Source/WebCore/platform/graphics/qt/ImageBufferQt.cpp b/Source/WebCore/platform/graphics/qt/ImageBufferQt.cpp index 09c90a6a0..f8a929c3f 100644 --- a/Source/WebCore/platform/graphics/qt/ImageBufferQt.cpp +++ b/Source/WebCore/platform/graphics/qt/ImageBufferQt.cpp @@ -3,7 +3,7 @@ * Copyright (C) 2008 Holger Hans Peter Freyther * Copyright (C) 2009 Dirk Schulze <krit@webkit.org> * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved. - * Copyright (C) 2014 Digia Plc. and/or its subsidiary(-ies) + * Copyright (C) 2015 The Qt Company Ltd * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/Source/WebCore/platform/graphics/qt/QFramebufferPaintDevice.cpp b/Source/WebCore/platform/graphics/qt/QFramebufferPaintDevice.cpp index 569b8cb3f..37ad7a1bf 100644 --- a/Source/WebCore/platform/graphics/qt/QFramebufferPaintDevice.cpp +++ b/Source/WebCore/platform/graphics/qt/QFramebufferPaintDevice.cpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2014 Digia Plc. and/or its subsidiary(-ies) + Copyright (C) 2015 The Qt Company Ltd This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/Source/WebCore/platform/graphics/qt/QFramebufferPaintDevice.h b/Source/WebCore/platform/graphics/qt/QFramebufferPaintDevice.h index 757c417f9..3d6c00a69 100644 --- a/Source/WebCore/platform/graphics/qt/QFramebufferPaintDevice.h +++ b/Source/WebCore/platform/graphics/qt/QFramebufferPaintDevice.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2014 Digia Plc. and/or its subsidiary(-ies) + Copyright (C) 2015 The Qt Company Ltd This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/Source/WebCore/platform/graphics/surfaces/GraphicsSurfaceToken.h b/Source/WebCore/platform/graphics/surfaces/GraphicsSurfaceToken.h index c97f368bd..98437c53f 100644 --- a/Source/WebCore/platform/graphics/surfaces/GraphicsSurfaceToken.h +++ b/Source/WebCore/platform/graphics/surfaces/GraphicsSurfaceToken.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Digia Corporation and/or its subsidiary(-ies) + Copyright (C) 2015 The Qt Company Ltd This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/Source/WebCore/platform/network/FormData.cpp b/Source/WebCore/platform/network/FormData.cpp index 72be6b7be..9d1f2630e 100644 --- a/Source/WebCore/platform/network/FormData.cpp +++ b/Source/WebCore/platform/network/FormData.cpp @@ -1,7 +1,7 @@ /* * Copyright (C) 2004, 2006, 2008, 2011 Apple Inc. All rights reserved. * Copyright (C) 2009 Google Inc. All rights reserved. - * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies) + * Copyright (C) 2015 The Qt Company Ltd * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/Source/WebCore/platform/network/qt/DNSQt.cpp b/Source/WebCore/platform/network/qt/DNSQt.cpp index 8ebb14b9c..e63214799 100644 --- a/Source/WebCore/platform/network/qt/DNSQt.cpp +++ b/Source/WebCore/platform/network/qt/DNSQt.cpp @@ -1,6 +1,5 @@ /* - Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies) - (C) 2012 Digia Plc. and/or its subsidiary(-ies) + Copyright (C) 2015 The Qt Company Ltd This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp b/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp index f884a9fdb..e24d0b1c8 100644 --- a/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp +++ b/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2008, 2012 Digia Plc. and/or its subsidiary(-ies) + Copyright (C) 2015 The Qt Company Ltd Copyright (C) 2007 Staikos Computing Services Inc. <info@staikos.net> Copyright (C) 2008 Holger Hans Peter Freyther @@ -50,10 +50,11 @@ FormDataIODevice::FormDataIODevice(FormData* data) , m_currentDelta(0) , m_fileSize(0) , m_dataSize(0) + , m_formData(data) { setOpenMode(FormDataIODevice::ReadOnly); - prepareFormElements(data); + prepareFormElements(); prepareCurrentElement(); computeSize(); } @@ -63,19 +64,29 @@ FormDataIODevice::~FormDataIODevice() delete m_currentFile; } -void FormDataIODevice::prepareFormElements(FormData* formData) +bool FormDataIODevice::reset() { - if (!formData) - return; + if (m_currentFile) + m_currentFile->close(); - RefPtr<FormData> formDataRef(formData); + m_currentDelta = 0; + m_formElements = m_formData->elements(); + + prepareCurrentElement(); + return true; +} + +void FormDataIODevice::prepareFormElements() +{ + if (!m_formData) + return; #if ENABLE(BLOB) - formDataRef = formDataRef->resolveBlobReferences(); + m_formData = m_formData->resolveBlobReferences(); #endif // Take a deep copy of the FormDataElements - m_formElements = formDataRef->elements(); + m_formElements = m_formData->elements(); } diff --git a/Source/WebCore/platform/network/qt/QNetworkReplyHandler.h b/Source/WebCore/platform/network/qt/QNetworkReplyHandler.h index bf838fdc2..8b31d3a1c 100644 --- a/Source/WebCore/platform/network/qt/QNetworkReplyHandler.h +++ b/Source/WebCore/platform/network/qt/QNetworkReplyHandler.h @@ -179,13 +179,14 @@ public: bool isSequential() const; qint64 getFormDataSize() const { return m_fileSize + m_dataSize; } + virtual bool reset(); protected: qint64 readData(char*, qint64); qint64 writeData(const char*, qint64); private: - void prepareFormElements(FormData*); + void prepareFormElements(); void moveToNextElement(); qint64 computeSize(); void openFileForCurrentElement(); @@ -197,6 +198,7 @@ private: qint64 m_currentDelta; qint64 m_fileSize; qint64 m_dataSize; + RefPtr<FormData> m_formData; }; } diff --git a/Source/WebCore/platform/qt/QStyleFacade.h b/Source/WebCore/platform/qt/QStyleFacade.h index d3cb43166..fe7ead1d0 100644 --- a/Source/WebCore/platform/qt/QStyleFacade.h +++ b/Source/WebCore/platform/qt/QStyleFacade.h @@ -1,7 +1,7 @@ /* * This file is part of the theme implementation for form controls in WebCore. * - * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). + * Copyright (C) 2015 The Qt Company Ltd. * Copyright (C) 2011-2012 Nokia Corporation and/or its subsidiary(-ies). * * This library is free software; you can redistribute it and/or diff --git a/Source/WebCore/plugins/qt/PluginPackageQt.cpp b/Source/WebCore/plugins/qt/PluginPackageQt.cpp index b8b9f553f..a923d49aa 100644 --- a/Source/WebCore/plugins/qt/PluginPackageQt.cpp +++ b/Source/WebCore/plugins/qt/PluginPackageQt.cpp @@ -42,7 +42,11 @@ bool PluginPackage::fetchInfo() if (isPluginBlacklisted()) return false; m_module = new QLibrary((QString)m_path); +#if QT_VERSION >= QT_VERSION_CHECK(5,5,0) + m_module->setLoadHints(QLibrary::ResolveAllSymbolsHint | QLibrary::DeepBindHint); +#else m_module->setLoadHints(QLibrary::ResolveAllSymbolsHint); +#endif if (!m_module->load()) { LOG(Plugins, "%s not loaded (%s)", m_path.utf8().data(), m_module->errorString().toLatin1().constData()); @@ -144,7 +148,8 @@ static void initializeGtk(QLibrary* module = 0) bool PluginPackage::isPluginBlacklisted() { - // TODO: enumerate all plugins that are incompatible with Qt5. + // These plugins are incompatible because they themselves use dlopen on + // subplugins linked against Qt 4 but without using DEEPBIND. const QLatin1String pluginBlacklist[] = { QLatin1String("skypebuttons"), QLatin1String("libkpartsplugin"), @@ -171,7 +176,11 @@ bool PluginPackage::load() if (!m_module) { m_module = new QLibrary((QString)m_path); +#if QT_VERSION >= QT_VERSION_CHECK(5,5,0) + m_module->setLoadHints(QLibrary::ResolveAllSymbolsHint | QLibrary::DeepBindHint); +#else m_module->setLoadHints(QLibrary::ResolveAllSymbolsHint); +#endif if (!m_module->load()) { LOG(Plugins, "%s not loaded (%s)", m_path.utf8().data(), m_module->errorString().toLatin1().constData()); diff --git a/Source/WebKit/qt/Api/qwebkitplatformplugin.h b/Source/WebKit/qt/Api/qwebkitplatformplugin.h index 10cc0fd7d..c6624b51e 100644 --- a/Source/WebKit/qt/Api/qwebkitplatformplugin.h +++ b/Source/WebKit/qt/Api/qwebkitplatformplugin.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) - * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + * Copyright (C) 2015 The Qt Company Ltd. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp b/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp index f4d7f0572..ac232805f 100644 --- a/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp +++ b/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). + * Copyright (C) 2015 The Qt Company Ltd. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.h b/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.h index e5cd4a6bb..8327b8d81 100644 --- a/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.h +++ b/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). + * Copyright (C) 2015 The Qt Company Ltd. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp b/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp index 734601ec2..d1a7f6cab 100644 --- a/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp +++ b/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). + * Copyright (C) 2015 The Qt Company Ltd. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.h b/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.h index 1a26fe177..ee4d2595a 100644 --- a/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.h +++ b/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). + * Copyright (C) 2015 The Qt Company Ltd. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/Source/WebKit/qt/WebCoreSupport/QtPluginWidgetAdapter.cpp b/Source/WebKit/qt/WebCoreSupport/QtPluginWidgetAdapter.cpp index ef54a5ab8..708375e4f 100644 --- a/Source/WebKit/qt/WebCoreSupport/QtPluginWidgetAdapter.cpp +++ b/Source/WebKit/qt/WebCoreSupport/QtPluginWidgetAdapter.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). + * Copyright (C) 2015 The Qt Company Ltd. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/Source/WebKit/qt/WebCoreSupport/QtPluginWidgetAdapter.h b/Source/WebKit/qt/WebCoreSupport/QtPluginWidgetAdapter.h index 324de7866..2b701d42d 100644 --- a/Source/WebKit/qt/WebCoreSupport/QtPluginWidgetAdapter.h +++ b/Source/WebKit/qt/WebCoreSupport/QtPluginWidgetAdapter.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). + * Copyright (C) 2015 The Qt Company Ltd. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/Source/WebKit/qt/WebCoreSupport/QtPrintContext.cpp b/Source/WebKit/qt/WebCoreSupport/QtPrintContext.cpp index 378ec2c68..579269004 100644 --- a/Source/WebKit/qt/WebCoreSupport/QtPrintContext.cpp +++ b/Source/WebKit/qt/WebCoreSupport/QtPrintContext.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). + * Copyright (C) 2015 The Qt Company Ltd. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/Source/WebKit/qt/WebCoreSupport/QtPrintContext.h b/Source/WebKit/qt/WebCoreSupport/QtPrintContext.h index 7d49d7ac8..9a6a68ceb 100644 --- a/Source/WebKit/qt/WebCoreSupport/QtPrintContext.h +++ b/Source/WebKit/qt/WebCoreSupport/QtPrintContext.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). + * Copyright (C) 2015 The Qt Company Ltd. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/Source/WebKit/qt/WebCoreSupport/TextureMapperLayerClientQt.cpp b/Source/WebKit/qt/WebCoreSupport/TextureMapperLayerClientQt.cpp index dff4e0eb1..4eba05207 100644 --- a/Source/WebKit/qt/WebCoreSupport/TextureMapperLayerClientQt.cpp +++ b/Source/WebKit/qt/WebCoreSupport/TextureMapperLayerClientQt.cpp @@ -1,6 +1,6 @@ /* * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) - * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies) + * Copyright (C) 2015 The Qt Company Ltd * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/Source/WebKit/qt/WebCoreSupport/TextureMapperLayerClientQt.h b/Source/WebKit/qt/WebCoreSupport/TextureMapperLayerClientQt.h index 2ffb5f0aa..fada27a53 100644 --- a/Source/WebKit/qt/WebCoreSupport/TextureMapperLayerClientQt.h +++ b/Source/WebKit/qt/WebCoreSupport/TextureMapperLayerClientQt.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) - * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies) + * Copyright (C) 2015 The Qt Company Ltd * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/Source/WebKit/qt/WidgetApi/qwebframe.cpp b/Source/WebKit/qt/WidgetApi/qwebframe.cpp index eb7821d53..e8faab881 100644 --- a/Source/WebKit/qt/WidgetApi/qwebframe.cpp +++ b/Source/WebKit/qt/WidgetApi/qwebframe.cpp @@ -1164,7 +1164,11 @@ QUrl QWebHitTestResult::linkUrl() const return d->linkUrl; } +#if QT_DEPRECATED_SINCE(5,5) /*! + \obsolete + Use linkTitleString instead. + Returns the title of the link. */ QUrl QWebHitTestResult::linkTitle() const @@ -1173,6 +1177,18 @@ QUrl QWebHitTestResult::linkTitle() const return QUrl(); return d->linkTitle; } +#endif // QT_DEPRECATED_SINCE(5,5) + +/*! + \since 5.5 + Returns the title of the link. +*/ +QString QWebHitTestResult::linkTitleString() const +{ + if (!d) + return QString(); + return d->linkTitle; +} /*! \since 4.6 diff --git a/Source/WebKit/qt/WidgetApi/qwebframe.h b/Source/WebKit/qt/WidgetApi/qwebframe.h index d665bd12f..619594336 100644 --- a/Source/WebKit/qt/WidgetApi/qwebframe.h +++ b/Source/WebKit/qt/WidgetApi/qwebframe.h @@ -79,7 +79,10 @@ public: QString linkText() const; QUrl linkUrl() const; - QUrl linkTitle() const; +#if QT_DEPRECATED_SINCE(5,5) + QT_DEPRECATED QUrl linkTitle() const; +#endif // QT_DEPRECATED_SINCE(5,5) + QString linkTitleString() const; QWebFrame *linkTargetFrame() const; QWebElement linkElement() const; diff --git a/Source/WebKit/qt/WidgetSupport/DefaultFullScreenVideoHandler.cpp b/Source/WebKit/qt/WidgetSupport/DefaultFullScreenVideoHandler.cpp index 0fe24e8bd..72aadd01c 100644 --- a/Source/WebKit/qt/WidgetSupport/DefaultFullScreenVideoHandler.cpp +++ b/Source/WebKit/qt/WidgetSupport/DefaultFullScreenVideoHandler.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). + * Copyright (C) 2015 The Qt Company Ltd. * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). * * This library is free software; you can redistribute it and/or diff --git a/Source/WebKit/qt/WidgetSupport/DefaultFullScreenVideoHandler.h b/Source/WebKit/qt/WidgetSupport/DefaultFullScreenVideoHandler.h index e943c55e4..aede68952 100644 --- a/Source/WebKit/qt/WidgetSupport/DefaultFullScreenVideoHandler.h +++ b/Source/WebKit/qt/WidgetSupport/DefaultFullScreenVideoHandler.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). + * Copyright (C) 2015 The Qt Company Ltd. * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). * * This library is free software; you can redistribute it and/or diff --git a/Source/WebKit/qt/WidgetSupport/InitWebKitQt.cpp b/Source/WebKit/qt/WidgetSupport/InitWebKitQt.cpp index 8d26375cc..d4afa40e7 100644 --- a/Source/WebKit/qt/WidgetSupport/InitWebKitQt.cpp +++ b/Source/WebKit/qt/WidgetSupport/InitWebKitQt.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). + * Copyright (C) 2015 The Qt Company Ltd. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/Source/WebKit/qt/WidgetSupport/InitWebKitQt.h b/Source/WebKit/qt/WidgetSupport/InitWebKitQt.h index 772c96094..d5ff6187b 100644 --- a/Source/WebKit/qt/WidgetSupport/InitWebKitQt.h +++ b/Source/WebKit/qt/WidgetSupport/InitWebKitQt.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). + * Copyright (C) 2015 The Qt Company Ltd. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/Source/WebKit/qt/WidgetSupport/InspectorClientWebPage.cpp b/Source/WebKit/qt/WidgetSupport/InspectorClientWebPage.cpp index dc4730b32..8e5427b23 100644 --- a/Source/WebKit/qt/WidgetSupport/InspectorClientWebPage.cpp +++ b/Source/WebKit/qt/WidgetSupport/InspectorClientWebPage.cpp @@ -2,7 +2,7 @@ * Copyright (C) 2007 Apple Inc. All rights reserved. * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) * Copyright (C) 2008 Holger Hans Peter Freyther - * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies) + * Copyright (C) 2015 The Qt Company Ltd * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/Source/WebKit/qt/WidgetSupport/InspectorClientWebPage.h b/Source/WebKit/qt/WidgetSupport/InspectorClientWebPage.h index 887f29b0c..a6ab065e5 100644 --- a/Source/WebKit/qt/WidgetSupport/InspectorClientWebPage.h +++ b/Source/WebKit/qt/WidgetSupport/InspectorClientWebPage.h @@ -2,7 +2,7 @@ * Copyright (C) 2007 Apple Inc. All rights reserved. * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) * Copyright (C) 2008 Holger Hans Peter Freyther - * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies) + * Copyright (C) 2015 The Qt Company Ltd * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/Source/WebKit/qt/WidgetSupport/QGraphicsWidgetPluginImpl.cpp b/Source/WebKit/qt/WidgetSupport/QGraphicsWidgetPluginImpl.cpp index 5137933a0..57abbf104 100644 --- a/Source/WebKit/qt/WidgetSupport/QGraphicsWidgetPluginImpl.cpp +++ b/Source/WebKit/qt/WidgetSupport/QGraphicsWidgetPluginImpl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). + * Copyright (C) 2015 The Qt Company Ltd. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/Source/WebKit/qt/WidgetSupport/QGraphicsWidgetPluginImpl.h b/Source/WebKit/qt/WidgetSupport/QGraphicsWidgetPluginImpl.h index 7f758226c..7be9bcb8d 100644 --- a/Source/WebKit/qt/WidgetSupport/QGraphicsWidgetPluginImpl.h +++ b/Source/WebKit/qt/WidgetSupport/QGraphicsWidgetPluginImpl.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). + * Copyright (C) 2015 The Qt Company Ltd. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.cpp b/Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.cpp index f967a45a6..5c22d96b7 100644 --- a/Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.cpp +++ b/Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.cpp @@ -1,7 +1,7 @@ /* * This file is part of the theme implementation for form controls in WebCore. * - * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). + * Copyright (C) 2015 The Qt Company Ltd. * Copyright (C) 2011-2012 Nokia Corporation and/or its subsidiary(-ies). * * This library is free software; you can redistribute it and/or diff --git a/Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.h b/Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.h index 3e677aeef..5ec4ec20a 100644 --- a/Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.h +++ b/Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.h @@ -1,7 +1,7 @@ /* * This file is part of the theme implementation for form controls in WebCore. * - * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). + * Copyright (C) 2015 The Qt Company Ltd. * Copyright (C) 2011-2012 Nokia Corporation and/or its subsidiary(-ies). * * This library is free software; you can redistribute it and/or diff --git a/Source/WebKit/qt/WidgetSupport/QWebUndoCommand.cpp b/Source/WebKit/qt/WidgetSupport/QWebUndoCommand.cpp index a196df50d..a6c22061e 100644 --- a/Source/WebKit/qt/WidgetSupport/QWebUndoCommand.cpp +++ b/Source/WebKit/qt/WidgetSupport/QWebUndoCommand.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). + * Copyright (C) 2015 The Qt Company Ltd. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/Source/WebKit/qt/WidgetSupport/QWebUndoCommand.h b/Source/WebKit/qt/WidgetSupport/QWebUndoCommand.h index 6e6121adc..b9e616925 100644 --- a/Source/WebKit/qt/WidgetSupport/QWebUndoCommand.h +++ b/Source/WebKit/qt/WidgetSupport/QWebUndoCommand.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). + * Copyright (C) 2015 The Qt Company Ltd. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/Source/WebKit/qt/WidgetSupport/QWidgetPluginImpl.cpp b/Source/WebKit/qt/WidgetSupport/QWidgetPluginImpl.cpp index b34e1fd21..7477f4fbc 100644 --- a/Source/WebKit/qt/WidgetSupport/QWidgetPluginImpl.cpp +++ b/Source/WebKit/qt/WidgetSupport/QWidgetPluginImpl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). + * Copyright (C) 2015 The Qt Company Ltd. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/Source/WebKit/qt/WidgetSupport/QWidgetPluginImpl.h b/Source/WebKit/qt/WidgetSupport/QWidgetPluginImpl.h index 7459b7eff..7892d8efc 100644 --- a/Source/WebKit/qt/WidgetSupport/QWidgetPluginImpl.h +++ b/Source/WebKit/qt/WidgetSupport/QWidgetPluginImpl.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). + * Copyright (C) 2015 The Qt Company Ltd. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/Source/WebKit/qt/WidgetSupport/QtFallbackWebPopup.h b/Source/WebKit/qt/WidgetSupport/QtFallbackWebPopup.h index 69b49bdbf..975fa4025 100644 --- a/Source/WebKit/qt/WidgetSupport/QtFallbackWebPopup.h +++ b/Source/WebKit/qt/WidgetSupport/QtFallbackWebPopup.h @@ -22,6 +22,7 @@ #include "qwebkitplatformplugin.h" #include <wtf/Platform.h> +#include <QtCore/QPointer> #ifndef QT_NO_COMBOBOX @@ -56,7 +57,7 @@ private Q_SLOTS: void deleteComboBox(); private: - QtWebComboBox* m_combo; + QPointer<QtWebComboBox> m_combo; const QWebPageAdapter* m_page; QRect m_geometry; QFont m_font; diff --git a/Source/WebKit/qt/examples/platformplugin/qwebkitplatformplugin.h b/Source/WebKit/qt/examples/platformplugin/qwebkitplatformplugin.h index c987069bd..a1d8ba1e1 100644 --- a/Source/WebKit/qt/examples/platformplugin/qwebkitplatformplugin.h +++ b/Source/WebKit/qt/examples/platformplugin/qwebkitplatformplugin.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) - * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + * Copyright (C) 2015 The Qt Company Ltd. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/Source/WebKit2/UIProcess/API/C/qt/WKIconDatabaseQt.cpp b/Source/WebKit2/UIProcess/API/C/qt/WKIconDatabaseQt.cpp index eee5c6f6d..012747942 100644 --- a/Source/WebKit2/UIProcess/API/C/qt/WKIconDatabaseQt.cpp +++ b/Source/WebKit2/UIProcess/API/C/qt/WKIconDatabaseQt.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + * Copyright (C) 2015 The Qt Company Ltd. * Copyright (C) 2011 Apple Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/Source/WebKit2/UIProcess/API/C/qt/WKIconDatabaseQt.h b/Source/WebKit2/UIProcess/API/C/qt/WKIconDatabaseQt.h index b472dfb98..d9352a271 100644 --- a/Source/WebKit2/UIProcess/API/C/qt/WKIconDatabaseQt.h +++ b/Source/WebKit2/UIProcess/API/C/qt/WKIconDatabaseQt.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + * Copyright (C) 2015 The Qt Company Ltd. * Copyright (C) 2011 Apple Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp b/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp index e260bb56f..11ebb4f81 100644 --- a/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp +++ b/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp @@ -1,7 +1,7 @@ /* * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies) * Copyright (c) 2012 Hewlett-Packard Development Company, L.P. - * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + * Copyright (C) 2015 The Qt Company Ltd. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/Source/WebKit2/UIProcess/API/qt/qwebchannelwebkittransport.cpp b/Source/WebKit2/UIProcess/API/qt/qwebchannelwebkittransport.cpp index 65739f4ea..49f14d83b 100644 --- a/Source/WebKit2/UIProcess/API/qt/qwebchannelwebkittransport.cpp +++ b/Source/WebKit2/UIProcess/API/qt/qwebchannelwebkittransport.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2014 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Milian Wolff <milian.wolff@kdab.com> -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the QtWebChannel module of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** $QT_END_LICENSE$ diff --git a/Source/WebKit2/UIProcess/API/qt/qwebchannelwebkittransport_p.h b/Source/WebKit2/UIProcess/API/qt/qwebchannelwebkittransport_p.h index 7072050fd..11a0b4829 100644 --- a/Source/WebKit2/UIProcess/API/qt/qwebchannelwebkittransport_p.h +++ b/Source/WebKit2/UIProcess/API/qt/qwebchannelwebkittransport_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2014 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Milian Wolff <milian.wolff@kdab.com> -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the QtWebChannel module of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** $QT_END_LICENSE$ diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_webchannel.qml b/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_webchannel.qml index 026e75fac..26f30eedd 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_webchannel.qml +++ b/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_webchannel.qml @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2014 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Milian Wolff <milian.wolff@kdab.com> -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the QtWebChannel module of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** $QT_END_LICENSE$ diff --git a/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp b/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp index 5915e7734..f2eadba94 100644 --- a/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp +++ b/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp @@ -1,7 +1,7 @@ /* * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) * Copyright (C) 2010 University of Szeged - * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + * Copyright (C) 2015 The Qt Company Ltd. * * All rights reserved. * diff --git a/Tools/QtTestBrowser/qttestbrowser.cpp b/Tools/QtTestBrowser/qttestbrowser.cpp index b9fa59399..7f96b5a65 100644 --- a/Tools/QtTestBrowser/qttestbrowser.cpp +++ b/Tools/QtTestBrowser/qttestbrowser.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + * Copyright (C) 2015 The Qt Company Ltd. * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies) * Copyright (C) 2009 Girish Ramakrishnan <girish@forwardbias.in> * Copyright (C) 2006 George Staikos <staikos@kde.org> diff --git a/Tools/TestWebKitAPI/qt/PlatformUtilitiesQt.cpp b/Tools/TestWebKitAPI/qt/PlatformUtilitiesQt.cpp index 5a3c13a66..b210a4a1d 100644 --- a/Tools/TestWebKitAPI/qt/PlatformUtilitiesQt.cpp +++ b/Tools/TestWebKitAPI/qt/PlatformUtilitiesQt.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + * Copyright (C) 2015 The Qt Company Ltd. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/Tools/TestWebKitAPI/qt/PlatformWebViewQt.cpp b/Tools/TestWebKitAPI/qt/PlatformWebViewQt.cpp index 8f571c544..17c786e8e 100644 --- a/Tools/TestWebKitAPI/qt/PlatformWebViewQt.cpp +++ b/Tools/TestWebKitAPI/qt/PlatformWebViewQt.cpp @@ -1,7 +1,7 @@ /* * Copyright (C) 2010 Apple Inc. All rights reserved. * Copyright (C) 2010 University of Szeged. All rights reserved. - * Copyright (C) 2013 Digia Plc. and/or its subsidiary(-ies). + * Copyright (C) 2015 The Qt Company Ltd. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/Tools/TestWebKitAPI/qt/main.cpp b/Tools/TestWebKitAPI/qt/main.cpp index efad5bbb3..e33da3036 100644 --- a/Tools/TestWebKitAPI/qt/main.cpp +++ b/Tools/TestWebKitAPI/qt/main.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + * Copyright (C) 2015 The Qt Company Ltd. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/Tools/qmake/config.tests/icu/icu.cpp b/Tools/qmake/config.tests/icu/icu.cpp index a663239b9..c1e6c6afa 100644 --- a/Tools/qmake/config.tests/icu/icu.cpp +++ b/Tools/qmake/config.tests/icu/icu.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** $QT_END_LICENSE$ diff --git a/Tools/qmake/config.tests/leveldb/leveldb.cpp b/Tools/qmake/config.tests/leveldb/leveldb.cpp index 9c647bc1e..503a078a2 100644 --- a/Tools/qmake/config.tests/leveldb/leveldb.cpp +++ b/Tools/qmake/config.tests/leveldb/leveldb.cpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2014 Digia Plc. and/or its subsidiary(-ies) + Copyright (C) 2015 The Qt Company Ltd This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/Tools/qmake/mkspecs/features/configure.prf b/Tools/qmake/mkspecs/features/configure.prf index 40362e932..0df5ee49e 100644 --- a/Tools/qmake/mkspecs/features/configure.prf +++ b/Tools/qmake/mkspecs/features/configure.prf @@ -106,8 +106,13 @@ defineTest(finalizeConfigure) { WEBKIT_CONFIG -= build_webkit2 build_minibrowser build_wtr } + production_build:qnx { + CONFIGURE_WARNINGS += "QtWebKitQml will not be build. It is not supported on QNX." + WEBKIT_CONFIG -= build_webkit2 build_minibrowser build_wtr + } + # Sanitize clashing options - santizeFeatures() + sanitizeFeatures() print_defaults { log(DEFINES: $$configDefines()$${EOL}) @@ -118,8 +123,8 @@ defineTest(finalizeConfigure) { !android:!mac:!config_icu { addReasonForSkippingBuild("ICU is required.") } - production_build:blackberry|qnx { - addReasonForSkippingBuild("Build not supported on BB10/QNX yet.") + production_build:blackberry { + addReasonForSkippingBuild("Build not supported on BB10 yet.") } !gnu_thin_archives:!win32-msvc2013:!mingw:contains(QT_CONFIG, static) { addReasonForSkippingBuild("QtWebKit cannot be built as a static library on this platform. Check your configuration in qtbase/config.summary.") diff --git a/Tools/qmake/mkspecs/features/features.prf b/Tools/qmake/mkspecs/features/features.prf index ef1d5d74a..7b0b49d90 100644 --- a/Tools/qmake/mkspecs/features/features.prf +++ b/Tools/qmake/mkspecs/features/features.prf @@ -150,7 +150,7 @@ defineTest(detectFeatures) { # ---------------- Sanitize features ------------------- -defineTest(santizeFeatures) { +defineTest(sanitizeFeatures) { # If we are doing a production_build we should only enable Geolocation support if QtPositioning exists. In developer builds we can use Mock implementations. production_build:!have?(qtpositioning): WEBKIT_CONFIG -= geolocation |