Updated submodules.

Change-Id: I9a9865ce282d870f755e08438ba187061a41ed9d Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
Added Qt3D as a part of qt5.git default repositories
2026-01-02 21:17:49 +08:00 · 2015-03-13 18:29:44 +00:00 · 2015-03-13 18:29:34 +00:00 · 2015-03-09 12:28:37 +01:00 · 2015-03-03 11:21:03 +01:00 · 2015-02-25 03:23:07 +00:00
46 changed files with 126 additions and 142 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,52 +1,52 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 5.4
+	branch = 5.5
 	initrepo = true
 [submodule "qtsvg"]
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 5.4
+	branch = 5.5
 	initrepo = true
 [submodule "qtdeclarative"]
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 5.4
+	branch = 5.5
 	initrepo = true
 [submodule "qtactiveqt"]
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 5.4
+	branch = 5.5
 	initrepo = true
 [submodule "qtscript"]
 	path = qtscript
 	url = ../qtscript.git
-	branch = 5.4
+	branch = 5.5
 	initrepo = true
 [submodule "qtmultimedia"]
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 5.4
+	branch = 5.5
 	initrepo = true
 [submodule "qttools"]
 	path = qttools
 	url = ../qttools.git
-	branch = 5.4
+	branch = 5.5
 	initrepo = true
 [submodule "qtxmlpatterns"]
 	path = qtxmlpatterns
 	url = ../qtxmlpatterns.git
-	branch = 5.4
+	branch = 5.5
 	initrepo = true
 [submodule "qttranslations"]
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 5.4
+	branch = 5.5
 	initrepo = true
 [submodule "qtdoc"]
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 5.4
+	branch = 5.5
 	initrepo = true
 [submodule "qtrepotools"]
 	path = qtrepotools
@@ -56,12 +56,12 @@
 [submodule "qtwebkit"]
 	path = qtwebkit
 	url = ../qtwebkit.git
-	branch = 5.4
+	branch = 5.5
 	initrepo = true
 [submodule "qtwebkit-examples"]
 	path = qtwebkit-examples
 	url = ../qtwebkit-examples.git
-	branch = 5.4
+	branch = 5.5
 	initrepo = true
 [submodule "qtqa"]
 	path = qtqa
@@ -71,12 +71,12 @@
 [submodule "qtlocation"]
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 5.4
+	branch = 5.5
 	initrepo = true
 [submodule "qtsensors"]
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 5.4
+	branch = 5.5
 	initrepo = true
 [submodule "qtsystems"]
 	path = qtsystems
@@ -97,79 +97,85 @@
 [submodule "qtconnectivity"]
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 5.4
+	branch = 5.5
 	initrepo = true
 [submodule "qtwayland"]
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 5.4
+	branch = 5.5
 	initrepo = true
 [submodule "qt3d"]
 	path = qt3d
 	url = ../qt3d.git
-	branch = dev
+	branch = 5.5
+	initrepo = true
 [submodule "qtimageformats"]
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 5.4
+	branch = 5.5
 	initrepo = true
 [submodule "qtquick1"]
 	path = qtquick1
 	url = ../qtquick1.git
-	branch = 5.4
+	branch = 5.5
 	initrepo = true
 [submodule "qtgraphicaleffects"]
 	path = qtgraphicaleffects
 	url = ../qtgraphicaleffects.git
-	branch = 5.4
+	branch = 5.5
 	initrepo = true
 [submodule "qtquickcontrols"]
 	path = qtquickcontrols
 	url = ../qtquickcontrols.git
-	branch = 5.4
+	branch = 5.5
 	initrepo = true
 [submodule "qtserialport"]
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 5.4
+	branch = 5.5
 	initrepo = true
 [submodule "qtx11extras"]
 	path = qtx11extras
 	url = ../qtx11extras.git
-	branch = 5.4
+	branch = 5.5
 	initrepo = true
 [submodule "qtmacextras"]
 	path = qtmacextras
 	url = ../qtmacextras.git
-	branch = 5.4
+	branch = 5.5
 	initrepo = true
 [submodule "qtwinextras"]
 	path = qtwinextras
 	url = ../qtwinextras.git
-	branch = 5.4
+	branch = 5.5
 	initrepo = true
 [submodule "qtandroidextras"]
 	path = qtandroidextras
 	url = ../qtandroidextras.git
-	branch = 5.4
+	branch = 5.5
 	initrepo = true
 [submodule "qtenginio"]
 	path = qtenginio
 	url = ../qtenginio.git
-	branch = 1.1
+	branch = 1.2
 	initrepo = true
 [submodule "qtwebsockets"]
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 5.4
+	branch = 5.5
 	initrepo = true
 [submodule "qtwebchannel"]
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 5.4
+	branch = 5.5
 	initrepo = true
 [submodule "qtwebengine"]
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 5.4
+	branch = 5.5
+	initrepo = true
+[submodule "qtcanvas3d"]
+	path = qtcanvas3d
+	url = ../qtcanvas3d.git
+	branch = 5.5
 	initrepo = true
--- 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
--- 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.
--- 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.
--- 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.
--- a/36
+++ b/36
@@ -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.
+## 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$
 ##
 #############################################################################
--- 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.
+:: 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$
 ::
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
--- a/36
+++ b/36
@@ -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$
 ##
 #############################################################################
--- a/qt.pro
+++ b/qt.pro
@@ -68,9 +68,8 @@ addModule(qtquickcontrols, qtdeclarative)
 addModule(qtmultimedia, qtbase, qtdeclarative)
 addModule(qtwinextras, qtbase, qtdeclarative qtmultimedia)
 addModule(qtactiveqt, qtbase)
-addModule(qt3d, qtdeclarative)
 addModule(qtsystems, qtbase, qtdeclarative)
-addModule(qtlocation, qtbase, qtsystems qtmultimedia)
+addModule(qtlocation, qtbase, qtdeclarative qtsystems)
 addModule(qtsensors, qtbase, qtdeclarative)
 addModule(qtconnectivity, qtbase $$ANDROID_EXTRAS, qtdeclarative)
 addModule(qtfeedback, qtdeclarative, qtmultimedia)
@@ -81,6 +80,8 @@ addModule(qtwebkit, qtdeclarative, qtlocation qtmultimedia qtsensors qtwebchanne
 addModule(qttools, qtbase, qtdeclarative qtactiveqt qtwebkit)
 addModule(qtwebkit-examples, qtwebkit qttools)
 addModule(qtimageformats, qtbase)
+addModule(qt3d, qtdeclarative qtimageformats)
+addModule(qtcanvas3d, qtdeclarative)
 addModule(qtgraphicaleffects, qtdeclarative)
 addModule(qtscript, qtbase, qttools)
 addModule(qtquick1, qtscript, qtsvg qtxmlpatterns qtwebkit)
@@ -88,7 +89,7 @@ addModule(qtdocgallery, qtdeclarative)
 linux:!android: addModule(qtwayland, qtbase, qtdeclarative)
 addModule(qtserialport, qtbase)
 addModule(qtenginio, qtdeclarative)
-addModule(qtwebengine, qtquickcontrols, qtwebkit)
+addModule(qtwebengine, qtquickcontrols qtwebchannel, qtwebkit qtlocation)
 addModule(qttranslations, qttools)
 addModule(qtdoc, qtdeclarative)
 addModule(qtqa, qtbase)
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/1
+++ b/1
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
Author	SHA1	Message	Date
Qt Submodule Update Bot	1b9965bf16	Updated submodules. Change-Id: I9a9865ce282d870f755e08438ba187061a41ed9d Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2015-03-13 18:29:44 +00:00
Jani Heikkinen	cb28f324e5	Added Qt3D as a part of qt5.git default repositories Change-Id: I0e74e6c6ab6c347396c449859b1cf24752a42fb8 Reviewed-by: Johanna Äijälä <johanna.aijala@digia.com>	2015-03-13 18:29:34 +00:00
Oswald Buddenhagen	a5edc40176	Merge remote-tracking branch 'origin/5.4' into 5.5	2015-03-09 12:28:37 +01:00
Oswald Buddenhagen	4b962aee82	Merge remote-tracking branch 'origin/dev' into 5.5 Conflicts: .gitmodules Change-Id: I45e015a2c4eb3778d2346569de9b7f09e72a58bf	2015-03-03 11:21:03 +01:00
Jani Heikkinen	c2d151522b	Update copyright headers Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: Ieb3be34b0d4061fb8dc886991528951f59dbd67e Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com> Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>	2015-02-25 03:23:07 +00:00
Qt Submodule Update Bot	9a9865ce28	Updated submodules. Change-Id: Ibe35b9f9af23a2b84ccab7e24b10e70d9324e42b Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2015-02-25 03:22:48 +00:00
Alex Blasche	811a77a53c	Add qtdeclarative as optional dependency for qtlocation Change-Id: Id6d406cd98b64ba111d1eb9cb0b03360a05fbca7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>	2015-02-17 06:42:55 +00:00
Oswald Buddenhagen	f46b8dc760	Merge remote-tracking branch 'origin/5.5' into dev Change-Id: Ie7b1685080b978cc1d8790823f79e98e930ca147	2015-02-16 16:24:40 +01:00
Oswald Buddenhagen	f900f38f71	Merge remote-tracking branch 'origin/5.4' into 5.5 Conflicts: qtandroidextras qtbase qtconnectivity qtdeclarative qtdoc qtenginio qtmacextras qtmultimedia qtquick1 qtscript qtsensors qtserialport qtsvg qttools qtwayland qtwebchannel qtwebengine qtwebkit qtwebsockets qtwinextras qtx11extras qtxmlpatterns Change-Id: I98b5e8165cd8575888d18198d8d8e8412e7bfaf0	2015-02-16 16:19:22 +01:00
Oswald Buddenhagen	122d4551b5	Adjust submodule branches Change-Id: I952bb9255a393baec2d9ede1cabfca7a47e2dc93	2015-02-16 15:50:02 +01:00
Qt Submodule Update Bot	2c39898934	Updated submodules. Change-Id: I9347499e78f03710eaf24af3c1e7ac650d0ef81d Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2015-02-13 15:11:39 +00:00
Pasi Keranen	682766b9fa	Add qtcanvas3d as submodule [ChangeLog][General] Added QtCanvas3D module, a JavaScript 3D rendering API for QtQuick. Change-Id: I9448f87ba8c8ccfb2dd6cf790d29bb561b9e9740 Reviewed-by: Pasi Keränen <pasi.keranen@digia.com> Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2015-02-13 15:11:19 +00:00
Pierre Rossi	3e40bbd114	QtWebEngine: add dependency on QtWebChannel To allow using the integration that makes use of a custom transport over Chromium IPC. Also add QtLocation as an optional dependency for correctness, and update the pinned sha1 Change-Id: I71d88be0859a74ad82f539d00f02b51d1c3e5218 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>	2015-02-11 21:59:19 +00:00
Alex Blasche	f36d7e5d9b	QtLocation doesn't depend on QtMultimedia anymore. Change-Id: Id75a7fc591064639a38694149517924dd33b56fb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>	2015-02-04 06:15:03 +00:00
Qt Submodule Update Bot	9347499e78	Updated submodules. Change-Id: I25db2aa87f437c03d7929959c3e6d94d9fc0d541 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2015-01-29 09:13:14 +00:00
Sean Harmer	6fd8d9ffd5	Qt3D depends upon qtimageformats module Qt3D makes use of the webp image format in its examples to minimize the size of assets. Support for webp is provided by qtimageformats. Change-Id: Id70b584123dc6174848947029ee034593ccc42e0 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>	2014-12-30 13:24:35 +01:00
Qt Submodule Update Bot	25db2aa87f	Updated submodules. Change-Id: Ia68a6b964f770fef3ea3d52f29d0c7a86186e80c Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2014-12-18 08:14:43 +01:00
Oswald Buddenhagen	7943697cdd	adjust submodule branch names for dev branch Change-Id: I65ea644943aa345b8f0fd1d5fcdfccf8f86ed914 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>	2014-12-05 14:53:15 +01:00
Oswald Buddenhagen	028bfeeee3	Merge remote-tracking branch 'origin/5.4' into dev Change-Id: Ia8938b7bb2c0393c1799b64309c3cadc7293ad8e Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>	2014-12-05 14:51:59 +01:00
Alex Blasche	a22e673995	Revert "Skip not supported modules on wince." The decision to exclude wince builds from Qt is one the modules have to do and not the "build system". While there might be justification to do this for some modules the decision is a module decision and as such the individual modules should make it. This reverts commit `d870bd65b0`. Change-Id: I60fd9944a71968c819a27da91fdc58923bbbb776 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>	2014-12-05 14:50:34 +01:00
Qt Submodule Update Bot	a17124e831	Updated submodules. Change-Id: I869fce8a6bd6db20b58facdd2a476dacdf3b7d69 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>	2014-10-16 11:27:42 +02:00
Qt Submodule Update Bot	869fce8a6b	Updated submodules. Change-Id: Ie3a3e5d05bb46e1f80d1c83d4d3c564040a6ae14 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>	2014-09-12 20:16:37 +02:00
Qt Submodule Update Bot	e3a3e5d05b	Updated submodules. Change-Id: Ie073b25926d4c538cb9f41d4c59d171857a60ede Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>	2014-09-02 20:36:04 +02:00
Bjoern Breitmeyer	d870bd65b0	Skip not supported modules on wince. Change-Id: I6ac73c759453813718c6d96c7d6cb27bcbf9815b Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>	2014-08-28 08:34:39 +02:00