diff options
| -rw-r--r-- | .gitmodules | 62 | ||||
| -rw-r--r-- | LGPL_EXCEPTION.txt | 2 | ||||
| -rw-r--r-- | LICENSE.GPLv2 | 4 | ||||
| -rw-r--r-- | LICENSE.LGPLv21 | 4 | ||||
| -rw-r--r-- | LICENSE.LGPLv3 | 4 | ||||
| -rwxr-xr-x | configure | 38 | ||||
| -rw-r--r-- | configure.bat | 38 | ||||
| -rwxr-xr-x | init-repository | 36 | ||||
| m--------- | qtactiveqt | 0 | ||||
| m--------- | qtandroidextras | 0 | ||||
| m--------- | qtbase | 0 | ||||
| m--------- | qtcanvas3d | 0 | ||||
| m--------- | qtconnectivity | 0 | ||||
| m--------- | qtdeclarative | 0 | ||||
| m--------- | qtdoc | 0 | ||||
| m--------- | qtenginio | 0 | ||||
| m--------- | qtgraphicaleffects | 0 | ||||
| m--------- | qtimageformats | 0 | ||||
| m--------- | qtlocation | 0 | ||||
| m--------- | qtmacextras | 0 | ||||
| m--------- | qtmultimedia | 0 | ||||
| m--------- | qtqa | 0 | ||||
| m--------- | qtquick1 | 0 | ||||
| m--------- | qtquickcontrols | 0 | ||||
| m--------- | qtrepotools | 0 | ||||
| m--------- | qtscript | 0 | ||||
| m--------- | qtsensors | 0 | ||||
| m--------- | qtsvg | 0 | ||||
| m--------- | qttools | 0 | ||||
| m--------- | qtwayland | 0 | ||||
| m--------- | qtwebchannel | 0 | ||||
| m--------- | qtwebengine | 0 | ||||
| m--------- | qtwebkit | 0 | ||||
| m--------- | qtwebkit-examples | 0 | ||||
| m--------- | qtwebsockets | 0 | ||||
| m--------- | qtwinextras | 0 | ||||
| m--------- | qtx11extras | 0 | ||||
| m--------- | qtxmlpatterns | 0 |
38 files changed, 82 insertions, 106 deletions
diff --git a/.gitmodules b/.gitmodules index 6a2e68a1..c55010ca 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,52 +1,52 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = dev + branch = 5.5 initrepo = true [submodule "qtsvg"] path = qtsvg url = ../qtsvg.git - branch = dev + branch = 5.5 initrepo = true [submodule "qtdeclarative"] path = qtdeclarative url = ../qtdeclarative.git - branch = dev + branch = 5.5 initrepo = true [submodule "qtactiveqt"] path = qtactiveqt url = ../qtactiveqt.git - branch = dev + branch = 5.5 initrepo = true [submodule "qtscript"] path = qtscript url = ../qtscript.git - branch = dev + branch = 5.5 initrepo = true [submodule "qtmultimedia"] path = qtmultimedia url = ../qtmultimedia.git - branch = dev + branch = 5.5 initrepo = true [submodule "qttools"] path = qttools url = ../qttools.git - branch = dev + branch = 5.5 initrepo = true [submodule "qtxmlpatterns"] path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = dev + branch = 5.5 initrepo = true [submodule "qttranslations"] path = qttranslations url = ../qttranslations.git - branch = dev + branch = 5.5 initrepo = true [submodule "qtdoc"] path = qtdoc url = ../qtdoc.git - branch = dev + branch = 5.5 initrepo = true [submodule "qtrepotools"] path = qtrepotools @@ -56,12 +56,12 @@ [submodule "qtwebkit"] path = qtwebkit url = ../qtwebkit.git - branch = dev + branch = 5.5 initrepo = true [submodule "qtwebkit-examples"] path = qtwebkit-examples url = ../qtwebkit-examples.git - branch = dev + branch = 5.5 initrepo = true [submodule "qtqa"] path = qtqa @@ -71,12 +71,12 @@ [submodule "qtlocation"] path = qtlocation url = ../qtlocation.git - branch = dev + branch = 5.5 initrepo = true [submodule "qtsensors"] path = qtsensors url = ../qtsensors.git - branch = dev + branch = 5.5 initrepo = true [submodule "qtsystems"] path = qtsystems @@ -97,84 +97,84 @@ [submodule "qtconnectivity"] path = qtconnectivity url = ../qtconnectivity.git - branch = dev + branch = 5.5 initrepo = true [submodule "qtwayland"] path = qtwayland url = ../qtwayland.git - branch = dev + branch = 5.5 initrepo = true [submodule "qt3d"] path = qt3d url = ../qt3d.git - branch = dev + branch = 5.5 [submodule "qtimageformats"] path = qtimageformats url = ../qtimageformats.git - branch = dev + branch = 5.5 initrepo = true [submodule "qtquick1"] path = qtquick1 url = ../qtquick1.git - branch = dev + branch = 5.5 initrepo = true [submodule "qtgraphicaleffects"] path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = dev + branch = 5.5 initrepo = true [submodule "qtquickcontrols"] path = qtquickcontrols url = ../qtquickcontrols.git - branch = dev + branch = 5.5 initrepo = true [submodule "qtserialport"] path = qtserialport url = ../qtserialport.git - branch = dev + branch = 5.5 initrepo = true [submodule "qtx11extras"] path = qtx11extras url = ../qtx11extras.git - branch = dev + branch = 5.5 initrepo = true [submodule "qtmacextras"] path = qtmacextras url = ../qtmacextras.git - branch = dev + branch = 5.5 initrepo = true [submodule "qtwinextras"] path = qtwinextras url = ../qtwinextras.git - branch = dev + branch = 5.5 initrepo = true [submodule "qtandroidextras"] path = qtandroidextras url = ../qtandroidextras.git - branch = dev + branch = 5.5 initrepo = true [submodule "qtenginio"] path = qtenginio url = ../qtenginio.git - branch = dev + branch = 1.2 initrepo = true [submodule "qtwebsockets"] path = qtwebsockets url = ../qtwebsockets.git - branch = dev + branch = 5.5 initrepo = true [submodule "qtwebchannel"] path = qtwebchannel url = ../qtwebchannel.git - branch = dev + branch = 5.5 initrepo = true [submodule "qtwebengine"] path = qtwebengine url = ../qtwebengine.git - branch = dev + branch = 5.5 initrepo = true [submodule "qtcanvas3d"] path = qtcanvas3d url = ../qtcanvas3d.git - branch = dev + branch = 5.5 initrepo = true diff --git a/LGPL_EXCEPTION.txt b/LGPL_EXCEPTION.txt index 7e2e30ff..5cdacb9a 100644 --- a/LGPL_EXCEPTION.txt +++ b/LGPL_EXCEPTION.txt @@ -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 --git a/LICENSE.GPLv2 b/LICENSE.GPLv2 index 194c39cb..6dbb032f 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 341aa9ee..6e184611 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 aed671a0..8fbb7439 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. @@ -1,41 +1,33 @@ #! /bin/sh ############################################################################# ## -## Copyright (C) 2012 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 build tools of the Qt Toolkit. ## -## $QT_BEGIN_LICENSE:LGPL$ +## $QT_BEGIN_LICENSE:LGPL21$ ## Commercial License Usage ## 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 -## General Public License version 2.1 as published by the Free Software -## Foundation and appearing in the file LICENSE.LGPL included in the -## packaging of this file. Please review the following information to -## ensure the GNU Lesser General Public License version 2.1 requirements -## will be met: 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 +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## 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. ## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3.0 as published by the Free Software -## Foundation and appearing in the file LICENSE.GPL included in the -## packaging of this file. Please review the following information to -## ensure the GNU General Public License version 3.0 requirements will be -## met: http://www.gnu.org/copyleft/gpl.html. -## -## ## $QT_END_LICENSE$ ## ############################################################################# diff --git a/configure.bat b/configure.bat index d3bb977f..a9f81cb7 100644 --- a/configure.bat +++ b/configure.bat @@ -1,41 +1,33 @@ @echo off ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: :: -:: Copyright (C) 2012 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 tools applications of the Qt Toolkit. :: -:: $QT_BEGIN_LICENSE:LGPL$ +:: $QT_BEGIN_LICENSE:LGPL21$ :: Commercial License Usage :: 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 -:: General Public License version 2.1 as published by the Free Software -:: Foundation and appearing in the file LICENSE.LGPL included in the -:: packaging of this file. Please review the following information to -:: ensure the GNU Lesser General Public License version 2.1 requirements -:: will be met: 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 +:: General Public License version 2.1 or version 3 as published by the Free +:: Software Foundation and appearing in the file LICENSE.LGPLv21 and +:: LICENSE.LGPLv3 included in the packaging of this file. Please review the +:: following information to ensure the GNU Lesser General Public License +:: requirements will be met: https://www.gnu.org/licenses/lgpl.html and +:: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +:: +:: 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. :: -:: GNU General Public License Usage -:: Alternatively, this file may be used under the terms of the GNU -:: General Public License version 3.0 as published by the Free Software -:: Foundation and appearing in the file LICENSE.GPL included in the -:: packaging of this file. Please review the following information to -:: ensure the GNU General Public License version 3.0 requirements will be -:: met: http://www.gnu.org/copyleft/gpl.html. -:: -:: :: $QT_END_LICENSE$ :: ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: diff --git a/init-repository b/init-repository index 9a08406e..0061de4d 100755 --- a/init-repository +++ b/init-repository @@ -1,41 +1,33 @@ #!/usr/bin/env perl ############################################################################# ## -## Copyright (C) 2012 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 utilities of the Qt Toolkit. ## -## $QT_BEGIN_LICENSE:LGPL$ +## $QT_BEGIN_LICENSE:LGPL21$ ## Commercial License Usage ## 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 -## General Public License version 2.1 as published by the Free Software -## Foundation and appearing in the file LICENSE.LGPL included in the -## packaging of this file. Please review the following information to -## ensure the GNU Lesser General Public License version 2.1 requirements -## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## 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. ## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3.0 as published by the Free Software -## Foundation and appearing in the file LICENSE.GPL included in the -## packaging of this file. Please review the following information to -## ensure the GNU General Public License version 3.0 requirements will be -## met: http://www.gnu.org/copyleft/gpl.html. -## -## ## $QT_END_LICENSE$ ## ############################################################################# diff --git a/qtactiveqt b/qtactiveqt -Subproject fc8bd008b15f148171614be2a7730b40ff03231 +Subproject 35c178c310ebb85a8959d116acd913e7c050c8d diff --git a/qtandroidextras b/qtandroidextras -Subproject cf82978ac02114a9e0ea164443c0bb396fc7db0 +Subproject ecd7db7ff28c3dae943ea364464ee8941e36c4c diff --git a/qtbase b/qtbase -Subproject e9f30968ad777bc2d7fcd85adc4e9d38d70398d +Subproject d34353a065c443aac20376cbd88323480d76918 diff --git a/qtcanvas3d b/qtcanvas3d -Subproject 916c59c00c7df7c8f0652098462e042daac3048 +Subproject c5f092053b3e22ab06bb7a1d7418e4a31dcd3c0 diff --git a/qtconnectivity b/qtconnectivity -Subproject 3264db95f965a47f31ffe1ab768467ce827e41e +Subproject e4f0b0568c334695cbc3c90f5a040edc61a8dce diff --git a/qtdeclarative b/qtdeclarative -Subproject 6a50e6f63d46dfed4b1edc6a2a8d49f27ef9695 +Subproject 83a16630c13969e68cd3a5aaab73335ccb0d441 diff --git a/qtdoc b/qtdoc -Subproject e2e70692911f32cfea38269bd18603079277e2c +Subproject 79cadf244e8a8a6b596fb33d83a3371028a72b0 diff --git a/qtenginio b/qtenginio -Subproject 16afca15afe8e8c0f69d5e2c42a62bd92477b2e +Subproject 6fb83a4538ce5cd336b9ef462cf0856fc5379fe diff --git a/qtgraphicaleffects b/qtgraphicaleffects -Subproject a1897106ce1306c1083bff05493a760e11bd19c +Subproject 4ee79d3eb4baef9e5b2a3d263f002a24184d0e6 diff --git a/qtimageformats b/qtimageformats -Subproject 6aeeadf865d711a67185d06e563d9f63e67c31e +Subproject 097e6beeff3fb77dac86f8f38e467b2d704c2a2 diff --git a/qtlocation b/qtlocation -Subproject c23a10cd2c54799da62078f032e021c2ec0f976 +Subproject 4ae1f2b90ac318f2683d9474e35b50a37a2e333 diff --git a/qtmacextras b/qtmacextras -Subproject 2353df997fee7ec6b99765762f21c925c33a53a +Subproject df9fea2ac092b21e96ddf0db235be165cb973ba diff --git a/qtmultimedia b/qtmultimedia -Subproject bbfccc713546f9e7341fbe1af7482cafbdc4ea2 +Subproject f86a3b7bb3a601da9705ef178fda9658cdbfebb diff --git a/qtqa b/qtqa -Subproject f1caec8cebc7113d838d78ec1ce5e34173381c0 +Subproject 4169823ed7f18b99aec5058c17552b1e4124227 diff --git a/qtquick1 b/qtquick1 -Subproject 4b4c6a984b2bcdfcb5a77a024e48072a7aa854e +Subproject ad3874ec96c50ec23eeeddda6b5758beda5c9c3 diff --git a/qtquickcontrols b/qtquickcontrols -Subproject 6f15c206b069ed0fcf48a285bfcc4ad636927df +Subproject cdd0c1d5ac5daf8010e8088ca80e059dbea66ef diff --git a/qtrepotools b/qtrepotools -Subproject cbddd3a5a6c9022b456c0df0ae8cf30eddb8cde +Subproject 0507167af6cad7db86f891918862a2bdd966f1f diff --git a/qtscript b/qtscript -Subproject 6c387974ab827e53d96d9106a44df29584c1e2b +Subproject ca041dab3feb95e3b4a36dd2bec5c706166bb15 diff --git a/qtsensors b/qtsensors -Subproject 007772e642fc337a97e50f65babb62c52025747 +Subproject 19e41c59771bda6e64432a6e007afe76361ae3e diff --git a/qtsvg b/qtsvg -Subproject 684283ae80a6d844e80ac5f9ce4a816a3766a4f +Subproject 704ee03ee308086a33c29197af50f06c719ab6e diff --git a/qttools b/qttools -Subproject ef50aeaff84130e9bbab344027cdb78af8a92ca +Subproject 16d130014a481749941129b1dfe45120ea5130b diff --git a/qtwayland b/qtwayland -Subproject e6805407b62c9c57bac488813f77ee5cca71868 +Subproject d5500d96005c2d617e14a43b41462b48e59fdd6 diff --git a/qtwebchannel b/qtwebchannel -Subproject 9d705911391c456813ce54a52f70aa2ccbc5b55 +Subproject ccb40b720a675242b5b93333e5a56d5938086e0 diff --git a/qtwebengine b/qtwebengine -Subproject eee482929a81ae9d685a0ee140733227ceac654 +Subproject cc48526dfb85701629ad19bd1dadf88af548280 diff --git a/qtwebkit b/qtwebkit -Subproject 3a3681158677f319bce88eee75d2696b8231eb1 +Subproject aced58b77e9c91c98ac2ed60a2219d87fdc6c07 diff --git a/qtwebkit-examples b/qtwebkit-examples -Subproject 10edcf82d3e85fee00b8397d7a21c56a9dfa95e +Subproject e96fa2b3bad65ebe3415920cd7820966d89f2d6 diff --git a/qtwebsockets b/qtwebsockets -Subproject bb9c22280afea1687b4c8ac012139f23b29adf5 +Subproject b01068a406f6ebf51e103dd541f36fd6ef14480 diff --git a/qtwinextras b/qtwinextras -Subproject 8657988dd4074377a2131dee300ca35004869e3 +Subproject f7b3d9c5877c39a0d54b7497c1d5dd7d3e7f37f diff --git a/qtx11extras b/qtx11extras -Subproject a9a4e64127a06ca9d1ad7032e521a1181e0412f +Subproject fbbd39ea7b005e70e32c6ed284c0779ce995824 diff --git a/qtxmlpatterns b/qtxmlpatterns -Subproject b6d1d402b5b6b9f62f2359578cf1fc9677aea0d +Subproject 5e53b39e6a2dda3387dda9a810c4bfed8752ad6 |