diff options
66 files changed, 90 insertions, 91 deletions
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/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/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/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 efbee5357..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 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/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 1235ce690..e197a02aa 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 91c5e00de..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 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/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 d1cf7b57d..f12fec923 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 ab07b84b2..d08df953b 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/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/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 |