Hello community, here is the log from the commit of package libqt5-qtx11extras for openSUSE:Factory checked in at 2015-09-27 08:38:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtx11extras (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtx11extras.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libqt5-qtx11extras" Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtx11extras/libqt5-qtx11extras.changes 2015-06-06 09:52:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libqt5-qtx11extras.new/libqt5-qtx11extras.changes 2015-09-27 08:37:31.000000000 +0200 @@ -1,0 +2,8 @@ +Sun Aug 16 08:32:13 UTC 2015 - hrvoje.senjan@gmail.com + +- Update to 5.5.0 + * For more details please see: + http://blog.qt.io/blog/2015/07/01/qt-5-5-released/ + and https://wiki.qt.io/New_Features_in_Qt_5.5 + +------------------------------------------------------------------- Old: ---- qtx11extras-opensource-src-5.4.2.tar.xz New: ---- qtx11extras-opensource-src-5.5.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtx11extras.spec ++++++ --- /var/tmp/diff_new_pack.vKqFWx/_old 2015-09-27 08:37:32.000000000 +0200 +++ /var/tmp/diff_new_pack.vKqFWx/_new 2015-09-27 08:37:32.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libqt5-qtx11extras # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,11 +21,11 @@ %define libname libQt5X11Extras5 Name: libqt5-qtx11extras -Version: 5.4.2 +Version: 5.5.0 Release: 0 %define base_name libqt5 -%define real_version 5.4.2 -%define so_version 5.4.2 +%define real_version 5.5.0 +%define so_version 5.5.0 %define tar_version qtx11extras-opensource-src-%{real_version} Source: %{tar_version}.tar.xz Source1: baselibs.conf ++++++ qtx11extras-opensource-src-5.4.2.tar.xz -> qtx11extras-opensource-src-5.5.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtx11extras-opensource-src-5.4.2/.qmake.conf new/qtx11extras-opensource-src-5.5.0/.qmake.conf --- old/qtx11extras-opensource-src-5.4.2/.qmake.conf 2015-05-29 22:31:39.000000000 +0200 +++ new/qtx11extras-opensource-src-5.5.0/.qmake.conf 2015-06-29 22:13:47.000000000 +0200 @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.4.2 +MODULE_VERSION = 5.5.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtx11extras-opensource-src-5.4.2/.tag new/qtx11extras-opensource-src-5.5.0/.tag --- old/qtx11extras-opensource-src-5.4.2/.tag 2015-05-29 22:31:39.000000000 +0200 +++ new/qtx11extras-opensource-src-5.5.0/.tag 2015-06-29 22:13:47.000000000 +0200 @@ -1 +1 @@ -bcc86311359e138ecc3a8fc1ce6eee1cda2ec0f5 +e6a813c7869fb3677b15b3907bd6647b5f80bd5e diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtx11extras-opensource-src-5.4.2/LGPL_EXCEPTION.txt new/qtx11extras-opensource-src-5.5.0/LGPL_EXCEPTION.txt --- old/qtx11extras-opensource-src-5.4.2/LGPL_EXCEPTION.txt 2015-05-29 22:31:39.000000000 +0200 +++ new/qtx11extras-opensource-src-5.5.0/LGPL_EXCEPTION.txt 2015-06-29 22:13:47.000000000 +0200 @@ -1,4 +1,4 @@ -Digia Qt LGPL Exception version 1.1 +The Qt Company Qt LGPL Exception version 1.1 As an additional permission to the GNU Lesser General Public License version 2.1, the object code form of a "work that uses the Library" may incorporate diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtx11extras-opensource-src-5.4.2/LICENSE.GPLv2 new/qtx11extras-opensource-src-5.5.0/LICENSE.GPLv2 --- old/qtx11extras-opensource-src-5.4.2/LICENSE.GPLv2 2015-05-29 22:31:39.000000000 +0200 +++ new/qtx11extras-opensource-src-5.5.0/LICENSE.GPLv2 2015-06-29 22:13:47.000000000 +0200 @@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtx11extras-opensource-src-5.4.2/LICENSE.LGPLv21 new/qtx11extras-opensource-src-5.5.0/LICENSE.LGPLv21 --- old/qtx11extras-opensource-src-5.4.2/LICENSE.LGPLv21 2015-05-29 22:31:39.000000000 +0200 +++ new/qtx11extras-opensource-src-5.5.0/LICENSE.LGPLv21 2015-06-29 22:13:47.000000000 +0200 @@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtx11extras-opensource-src-5.4.2/LICENSE.LGPLv3 new/qtx11extras-opensource-src-5.5.0/LICENSE.LGPLv3 --- old/qtx11extras-opensource-src-5.4.2/LICENSE.LGPLv3 2015-05-29 22:31:39.000000000 +0200 +++ new/qtx11extras-opensource-src-5.5.0/LICENSE.LGPLv3 2015-06-29 22:13:47.000000000 +0200 @@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtx11extras-opensource-src-5.4.2/include/QtX11Extras/headers.pri new/qtx11extras-opensource-src-5.5.0/include/QtX11Extras/headers.pri --- old/qtx11extras-opensource-src-5.4.2/include/QtX11Extras/headers.pri 2015-05-29 22:31:39.000000000 +0200 +++ new/qtx11extras-opensource-src-5.5.0/include/QtX11Extras/headers.pri 2015-06-29 22:13:47.000000000 +0200 @@ -2,4 +2,5 @@ SYNCQT.HEADER_CLASSES = ../../include/QtX11Extras/QX11Info ../../include/QtX11Extras/QtX11ExtrasVersion SYNCQT.PRIVATE_HEADER_FILES = SYNCQT.QPA_HEADER_FILES = +SYNCQT.CLEAN_HEADER_FILES = qtx11extrasglobal.h qx11info_x11.h SYNCQT.INJECTIONS = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtx11extras-opensource-src-5.4.2/include/QtX11Extras/qtx11extrasversion.h new/qtx11extras-opensource-src-5.5.0/include/QtX11Extras/qtx11extrasversion.h --- old/qtx11extras-opensource-src-5.4.2/include/QtX11Extras/qtx11extrasversion.h 2015-05-29 22:31:39.000000000 +0200 +++ new/qtx11extras-opensource-src-5.5.0/include/QtX11Extras/qtx11extrasversion.h 2015-06-29 22:13:47.000000000 +0200 @@ -2,8 +2,8 @@ #ifndef QT_QTX11EXTRAS_VERSION_H #define QT_QTX11EXTRAS_VERSION_H -#define QTX11EXTRAS_VERSION_STR "5.4.2" +#define QTX11EXTRAS_VERSION_STR "5.5.0" -#define QTX11EXTRAS_VERSION 0x050402 +#define QTX11EXTRAS_VERSION 0x050500 #endif // QT_QTX11EXTRAS_VERSION_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtx11extras-opensource-src-5.4.2/src/x11extras/doc/src/qtx11extras-index.qdoc new/qtx11extras-opensource-src-5.5.0/src/x11extras/doc/src/qtx11extras-index.qdoc --- old/qtx11extras-opensource-src-5.4.2/src/x11extras/doc/src/qtx11extras-index.qdoc 2015-05-29 22:31:39.000000000 +0200 +++ new/qtx11extras-opensource-src-5.5.0/src/x11extras/doc/src/qtx11extras-index.qdoc 2015-06-29 22:13:47.000000000 +0200 @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 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 documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free ** Documentation License version 1.3 as published by the Free Software ** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure +** this file. Please review the following information to ensure ** the GNU Free Documentation License version 1.3 requirements ** will be met: http://www.gnu.org/copyleft/fdl.html. ** $QT_END_LICENSE$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtx11extras-opensource-src-5.4.2/src/x11extras/doc/src/qtx11extras-module.qdoc new/qtx11extras-opensource-src-5.5.0/src/x11extras/doc/src/qtx11extras-module.qdoc --- old/qtx11extras-opensource-src-5.4.2/src/x11extras/doc/src/qtx11extras-module.qdoc 2015-05-29 22:31:39.000000000 +0200 +++ new/qtx11extras-opensource-src-5.5.0/src/x11extras/doc/src/qtx11extras-module.qdoc 2015-06-29 22:13:47.000000000 +0200 @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 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 documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free ** Documentation License version 1.3 as published by the Free Software ** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure +** this file. Please review the following information to ensure ** the GNU Free Documentation License version 1.3 requirements ** will be met: http://www.gnu.org/copyleft/fdl.html. ** $QT_END_LICENSE$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtx11extras-opensource-src-5.4.2/src/x11extras/qtx11extrasglobal.h new/qtx11extras-opensource-src-5.5.0/src/x11extras/qtx11extrasglobal.h --- old/qtx11extras-opensource-src-5.4.2/src/x11extras/qtx11extrasglobal.h 2015-05-29 22:31:39.000000000 +0200 +++ new/qtx11extras-opensource-src-5.5.0/src/x11extras/qtx11extrasglobal.h 2015-06-29 22:13:47.000000000 +0200 @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2012 Intel Corporation. -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the QtCore 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtx11extras-opensource-src-5.4.2/src/x11extras/qx11info_x11.cpp new/qtx11extras-opensource-src-5.5.0/src/x11extras/qx11info_x11.cpp --- old/qtx11extras-opensource-src-5.4.2/src/x11extras/qx11info_x11.cpp 2015-05-29 22:31:39.000000000 +0200 +++ new/qtx11extras-opensource-src-5.5.0/src/x11extras/qx11info_x11.cpp 2015-06-29 22:13:47.000000000 +0200 @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2015 The Qt Company Ltd. ** Copyright (C) 2012 Richard Moore <rich@kde.org> ** Copyright (C) 2012 David Faure <david.faure@kdab.com> -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the QtGui module of the Qt Toolkit. ** @@ -12,9 +12,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 @@ -25,8 +25,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$ @@ -338,7 +338,7 @@ if (!native) return NULL; - void *display = native->nativeResourceForScreen(QByteArray("display"), QGuiApplication::primaryScreen()); + void *display = native->nativeResourceForIntegration(QByteArray("display")); return reinterpret_cast<Display *>(display); } @@ -355,7 +355,7 @@ if (!native) return NULL; - void *connection = native->nativeResourceForWindow(QByteArray("connection"), 0); + void *connection = native->nativeResourceForIntegration(QByteArray("connection")); return reinterpret_cast<xcb_connection_t *>(connection); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtx11extras-opensource-src-5.4.2/src/x11extras/qx11info_x11.h new/qtx11extras-opensource-src-5.5.0/src/x11extras/qx11info_x11.h --- old/qtx11extras-opensource-src-5.4.2/src/x11extras/qx11info_x11.h 2015-05-29 22:31:39.000000000 +0200 +++ new/qtx11extras-opensource-src-5.5.0/src/x11extras/qx11info_x11.h 2015-06-29 22:13:47.000000000 +0200 @@ -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 QtGui 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtx11extras-opensource-src-5.4.2/tests/auto/cmake/test_qx11_module/main.cpp new/qtx11extras-opensource-src-5.5.0/tests/auto/cmake/test_qx11_module/main.cpp --- old/qtx11extras-opensource-src-5.4.2/tests/auto/cmake/test_qx11_module/main.cpp 2015-05-29 22:31:39.000000000 +0200 +++ new/qtx11extras-opensource-src-5.5.0/tests/auto/cmake/test_qx11_module/main.cpp 2015-06-29 22:13:47.000000000 +0200 @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2012 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Stephen Kelly <stephen.kelly@kdab.com> -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the QtGui 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtx11extras-opensource-src-5.4.2/tests/auto/qx11info/tst_qx11info.cpp new/qtx11extras-opensource-src-5.5.0/tests/auto/qx11info/tst_qx11info.cpp --- old/qtx11extras-opensource-src-5.4.2/tests/auto/qx11info/tst_qx11info.cpp 2015-05-29 22:31:39.000000000 +0200 +++ new/qtx11extras-opensource-src-5.5.0/tests/auto/qx11info/tst_qx11info.cpp 2015-06-29 22:13:47.000000000 +0200 @@ -1,8 +1,8 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2015 The Qt Company Ltd. ** Copyright (C) 2012 David Faure <david.faure@kdab.com> -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the test suite of the Qt Toolkit. ** @@ -11,9 +11,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 @@ -24,8 +24,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$