Merge remote-tracking branch 'origin/5.4.2' into 5.4

Change-Id: Id8fa6d30810f8bfe46d5aa7e279c69ea560edd19
Updated submodules.
2026-01-01 04:45:41 +08:00 · 2015-08-14 13:34:32 +02:00 · 2015-06-19 18:49:53 +00:00 · 2015-05-31 06:58:29 +00:00 · 2015-05-29 20:12:13 +02:00 · 2015-05-29 15:53:05 +02:00
49 changed files with 149 additions and 133 deletions
--- a/.commit-template
+++ b/.commit-template
@@ -14,7 +14,7 @@
 #
 # ==[ Please wrap at 72 characters ]===================================|
 #
-# Remember to read http://wiki.qt-project.org/Commit_Policy
+# Remember to read http://wiki.qt.io/Commit_Policy
 #
 # Change log entry: If this commit adds a significant feature, fixes an
 # issue or contains a behavior change that is relevant to others,
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,52 +1,52 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 5.5
+	branch = 5.4
 	initrepo = true
 [submodule "qtsvg"]
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 5.5
+	branch = 5.4
 	initrepo = true
 [submodule "qtdeclarative"]
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 5.5
+	branch = 5.4
 	initrepo = true
 [submodule "qtactiveqt"]
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 5.5
+	branch = 5.4
 	initrepo = true
 [submodule "qtscript"]
 	path = qtscript
 	url = ../qtscript.git
-	branch = 5.5
+	branch = 5.4
 	initrepo = true
 [submodule "qtmultimedia"]
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 5.5
+	branch = 5.4
 	initrepo = true
 [submodule "qttools"]
 	path = qttools
 	url = ../qttools.git
-	branch = 5.5
+	branch = 5.4
 	initrepo = true
 [submodule "qtxmlpatterns"]
 	path = qtxmlpatterns
 	url = ../qtxmlpatterns.git
-	branch = 5.5
+	branch = 5.4
 	initrepo = true
 [submodule "qttranslations"]
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 5.5
+	branch = 5.4
 	initrepo = true
 [submodule "qtdoc"]
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 5.5
+	branch = 5.4
 	initrepo = true
 [submodule "qtrepotools"]
 	path = qtrepotools
@@ -56,12 +56,12 @@
 [submodule "qtwebkit"]
 	path = qtwebkit
 	url = ../qtwebkit.git
-	branch = 5.5
+	branch = 5.4
 	initrepo = true
 [submodule "qtwebkit-examples"]
 	path = qtwebkit-examples
 	url = ../qtwebkit-examples.git
-	branch = 5.5
+	branch = 5.4
 	initrepo = true
 [submodule "qtqa"]
 	path = qtqa
@@ -71,12 +71,12 @@
 [submodule "qtlocation"]
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 5.5
+	branch = 5.4
 	initrepo = true
 [submodule "qtsensors"]
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 5.5
+	branch = 5.4
 	initrepo = true
 [submodule "qtsystems"]
 	path = qtsystems
@@ -97,85 +97,79 @@
 [submodule "qtconnectivity"]
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 5.5
+	branch = 5.4
 	initrepo = true
 [submodule "qtwayland"]
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 5.5
+	branch = 5.4
 	initrepo = true
 [submodule "qt3d"]
 	path = qt3d
 	url = ../qt3d.git
-	branch = 5.5
-	initrepo = true
+	branch = dev
 [submodule "qtimageformats"]
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 5.5
+	branch = 5.4
 	initrepo = true
 [submodule "qtquick1"]
 	path = qtquick1
 	url = ../qtquick1.git
-	branch = 5.5
+	branch = 5.4
 	initrepo = true
 [submodule "qtgraphicaleffects"]
 	path = qtgraphicaleffects
 	url = ../qtgraphicaleffects.git
-	branch = 5.5
+	branch = 5.4
 	initrepo = true
 [submodule "qtquickcontrols"]
 	path = qtquickcontrols
 	url = ../qtquickcontrols.git
-	branch = 5.5
+	branch = 5.4
 	initrepo = true
 [submodule "qtserialport"]
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 5.5
+	branch = 5.4
 	initrepo = true
 [submodule "qtx11extras"]
 	path = qtx11extras
 	url = ../qtx11extras.git
-	branch = 5.5
+	branch = 5.4
 	initrepo = true
 [submodule "qtmacextras"]
 	path = qtmacextras
 	url = ../qtmacextras.git
-	branch = 5.5
+	branch = 5.4
 	initrepo = true
 [submodule "qtwinextras"]
 	path = qtwinextras
 	url = ../qtwinextras.git
-	branch = 5.5
+	branch = 5.4
 	initrepo = true
 [submodule "qtandroidextras"]
 	path = qtandroidextras
 	url = ../qtandroidextras.git
-	branch = 5.5
+	branch = 5.4
 	initrepo = true
 [submodule "qtenginio"]
 	path = qtenginio
 	url = ../qtenginio.git
-	branch = 1.2
+	branch = 1.1
 	initrepo = true
 [submodule "qtwebsockets"]
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 5.5
+	branch = 5.4
 	initrepo = true
 [submodule "qtwebchannel"]
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 5.5
+	branch = 5.4
 	initrepo = true
 [submodule "qtwebengine"]
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 5.5
-	initrepo = true
-[submodule "qtcanvas3d"]
-	path = qtcanvas3d
-	url = ../qtcanvas3d.git
-	branch = 5.5
+	branch = 5.4
 	initrepo = true
--- a/LGPL_EXCEPTION.txt
+++ b/LGPL_EXCEPTION.txt
@@ -1,4 +1,4 @@
-The Qt Company Qt LGPL Exception version 1.1
+Digia 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) 2015 The Qt Company Ltd.
- Contact: http://www.qt.io/licensing/
+ The Qt Toolkit is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+ Contact: http://www.qt-project.org/legal

 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) 2015 The Qt Company Ltd.
- Contact: http://www.qt.io/licensing/
+ The Qt Toolkit is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+ Contact: http://www.qt-project.org/legal

 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) 2015 The Qt Company Ltd.
- Contact: http://www.qt.io/licensing/
+ The Qt Toolkit is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+ Contact: http://www.qt-project.org/legal

 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/8
+++ b/8
@@ -14,7 +14,7 @@ HOW TO BUILD QT5

     For other platform specific requirements,
     please see section "Setting up your machine" on:
-     http://qt-project.org/wiki/Get_The_Source
+     http://wiki.qt.io/Get_The_Source

   Optional requirements
   ---------------------
@@ -119,9 +119,9 @@ HOW TO BUILD QT5

 Building Qt5 from git
 =====================
- See http://qt-project.org/wiki/Building-Qt-5-from-Git and README.git
+ See http://wiki.qt.io/Building_Qt_5_from_Git and README.git
 for more information.
- See http://qt-project.org/wiki/Qt-5 for the reference platforms.
+ See http://wiki.qt.io/Qt_5 for the reference platforms.


 Documentation
@@ -139,6 +139,6 @@ HOW TO BUILD QT5
 Running "qmake -query" will list the value of QT_INSTALL_DOCS.

 Information about Qt 5's documentation is located in qtbase/doc/README
- or in the following page: http://qt-project.org/wiki/Qt5DocumentationProject
+ or in the following page: http://wiki.qt.io/Qt5DocumentationProject

 Note: Building the documentation is only tested on desktop platforms.
--- a/README.git
+++ b/README.git
@@ -5,7 +5,7 @@ OBTAINING QT5 FROM GIT
 ========

 For a more in-depth description on how to build Qt5 from git,
- please see: http://qt-project.org/wiki/Building-Qt-5-from-Git
+ please see: http://wiki.qt.io/Building_Qt_5_from_Git


 Get The Submodules
@@ -52,4 +52,4 @@ OBTAINING QT5 FROM GIT
 ================================

 For more information on how to develop and contribute to Qt, please see:
- http://qt-project.org/wiki/Category:Developing_Qt
+ http://wiki.qt.io/Category:Developing_Qt
--- a/36
+++ b/36
@@ -1,33 +1,41 @@
 #! /bin/sh
 #############################################################################
 ##
-## Copyright (C) 2015 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+## Contact: http://www.qt-project.org/legal
 ##
 ## This file is part of the build tools of the Qt Toolkit.
 ##
-## $QT_BEGIN_LICENSE:LGPL21$
+## $QT_BEGIN_LICENSE:LGPL$
 ## 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 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.
+## 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.
 ##
 ## 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 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.
+## 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.
 ##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
+## In addition, as a special exception, Digia gives you certain additional
+## rights.  These rights are described in the Digia Qt 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,33 +1,41 @@
@echo off
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 ::
-:: Copyright (C) 2015 The Qt Company Ltd.
-:: Contact: http://www.qt.io/licensing/
+:: Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+:: Contact: http://www.qt-project.org/legal
 ::
 :: This file is part of the tools applications of the Qt Toolkit.
 ::
-:: $QT_BEGIN_LICENSE:LGPL21$
+:: $QT_BEGIN_LICENSE:LGPL$
 :: 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 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.
+:: 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.
 ::
 :: 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 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.
+:: 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.
 ::
-:: As a special exception, The Qt Company gives you certain additional
-:: rights. These rights are described in The Qt Company LGPL Exception
+:: In addition, as a special exception, Digia gives you certain additional
+:: rights.  These rights are described in the Digia Qt 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,33 +1,41 @@
 #!/usr/bin/env perl
 #############################################################################
 ##
-## Copyright (C) 2015 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+## Contact: http://www.qt-project.org/legal
 ##
 ## This file is part of the utilities of the Qt Toolkit.
 ##
-## $QT_BEGIN_LICENSE:LGPL21$
+## $QT_BEGIN_LICENSE:LGPL$
 ## 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 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.
+## 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.
 ##
 ## 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 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.
+## 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.
 ##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
+## In addition, as a special exception, Digia gives you certain additional
+## rights.  These rights are described in the Digia Qt 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,8 +68,9 @@ 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, qtdeclarative qtsystems)
+addModule(qtlocation, qtbase, qtsystems qtmultimedia)
 addModule(qtsensors, qtbase, qtdeclarative)
 addModule(qtconnectivity, qtbase $$ANDROID_EXTRAS, qtdeclarative)
 addModule(qtfeedback, qtdeclarative, qtmultimedia)
@@ -80,8 +81,6 @@ 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)
@@ -89,7 +88,7 @@ addModule(qtdocgallery, qtdeclarative)
 linux:!android: addModule(qtwayland, qtbase, qtdeclarative)
 addModule(qtserialport, qtbase)
 addModule(qtenginio, qtdeclarative)
-addModule(qtwebengine, qtquickcontrols qtwebchannel, qtwebkit qtlocation)
+addModule(qtwebengine, qtquickcontrols, qtwebkit)
 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
Oswald Buddenhagen	3f2ff8b460	Merge remote-tracking branch 'origin/5.4.2' into 5.4 Change-Id: Id8fa6d30810f8bfe46d5aa7e279c69ea560edd19	2015-08-14 13:34:32 +02:00
Qt Submodule Update Bot	0d60d720f8	Updated submodules. Change-Id: I00defc7101f1cabc0cc540a84846ec9b7933f599 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>	2015-06-19 18:49:53 +00:00
Qt Submodule Update Bot	00defc7101	Updated submodules. Change-Id: Ib62714f88c3cd381cbbf8758c7b1029c2fa254ed Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>	2015-05-31 06:58:29 +00:00
Oswald Buddenhagen	4a5968ce75	Merge branch '5.4' into 5.4.2 Change-Id: I33d967b5f668c672a55ad93ac314340453850521	2015-05-29 20:12:13 +02:00
Oswald Buddenhagen	843a3407f2	Merge tag 'v5.4.1' into 5.4 Qt 5.4.1 Release	2015-05-29 15:53:05 +02:00
Oswald Buddenhagen	5400507252	Merge tag 'v5.4.0' into 5.4 Qt 5.4.0 Release	2015-05-29 15:52:28 +02:00
Qt Submodule Update Bot	210493d641	Updated submodules. Change-Id: I670466b6a3ff58edb40c91ff86c443cd6dd20126 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2015-05-29 09:18:21 +00:00
Qt Submodule Update Bot	670466b6a3	Updated submodules. Change-Id: I07856d73e19b60fbc01ff650cddb1d557db35617 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>	2015-05-28 11:33:18 +00:00
Qt Submodule Update Bot	07856d73e1	Updated submodules. Change-Id: Idfffbfdc266be3f52f716b152bbcb70810127cc9 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2015-05-23 06:51:36 +00:00
Qt Submodule Update Bot	dfffbfdc26	Updated submodules. Change-Id: I24f1b3219d1db41acc3f0781fa38f253bcb04da3 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2015-05-16 04:57:35 +00:00
Qt Submodule Update Bot	b62714f88c	Updated submodules. Change-Id: I68b5c48282234a27f7c96595c8d84a4dc0bb3871 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>	2015-05-14 14:37:56 +00:00
Qt Submodule Update Bot	24f1b3219d	Updated submodules. Change-Id: If7cb995d04fdc05b35df8b6c5215bf530006b984 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>	2015-05-13 15:55:59 +00:00
Qt Submodule Update Bot	f7cb995d04	Updated submodules. Change-Id: I11963ba9f0141fc72dadedffe2c36fba5be16186 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2015-05-09 12:22:09 +00:00
Qt Submodule Update Bot	11963ba9f0	Updated submodules. Change-Id: I39ce0228dad0d141df17ea5f911046130f823467 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2015-05-03 07:57:31 +00:00
Qt Submodule Update Bot	39ce0228da	Updated submodules. Change-Id: I59e3021a529806b8b2ae7676b8f687099384f7e4 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2015-04-28 10:58:28 +00:00
Sergio Ahumada	95bb29e243	Replace old qt-project.org wiki with wiki.qt.io Change-Id: I9a1114a8b5da649d3da718248fe5df5781810c20 Reviewed-by: Tero Kojo <tero.kojo@theqtcompany.com> Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2015-04-16 09:42:01 +00:00
Qt Submodule Update Bot	68b5c48282	Updated submodules. Change-Id: I59e3021a529806b8b2ae7676b8f687099384f7e4 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2015-04-15 09:16:10 +00:00
Oswald Buddenhagen	451f0a193b	Adjust submodule branches Change-Id: Ib30d8a8c4691787c460fe6540b64e2d593422c68	2015-04-10 12:10:34 +02:00
Qt Submodule Update Bot	59e3021a52	Updated submodules. Change-Id: Ibe35b9f9af23a2b84ccab7e24b10e70d9324e42b Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2015-04-09 09:28:44 +00:00
Qt Submodule Update Bot	e3cd5bb368	Updated submodules. Change-Id: I0badf6179237bb89ffc57c7387cbf21ebc3b6665 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2015-02-16 19:57:25 +00:00
Qt Submodule Update Bot	0badf61792	Updated submodules. Change-Id: I98737b388b9898507bebcd8d05a86e7d916b6d25 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2015-02-14 08:54:49 +00:00
Qt Submodule Update Bot	98737b388b	Updated submodules. Change-Id: I9fb1a2e12fb6562c22dbac5fbca06d33046a5030 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2015-02-13 04:29:58 +00:00
Qt Submodule Update Bot	9fb1a2e12f	Updated submodules. Change-Id: Ib71478c424ed0a6fd8d058513aa9a68dda71336f Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2015-02-10 09:18:23 +00:00
Qt Submodule Update Bot	b71478c424	Updated submodules. Change-Id: I81efb6de3c49e6779556b1d1dfe06f1e1bc574f6 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2015-02-06 17:00:48 +00:00
Qt Submodule Update Bot	81efb6de3c	Updated submodules. Change-Id: Ief1f126ddc66293b041fe5658d57056761eefe05 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2015-02-03 11:14:37 +00:00
Qt Submodule Update Bot	ef1f126ddc	Updated submodules. Change-Id: I0163cb617aa19a26423a716bef23bfc6308aadc6 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2015-01-29 04:28:53 +00:00
Oswald Buddenhagen	c3a6185b7e	Adjust submodule branches Change-Id: I6f2358370d81238f462d26388d85aa5f74a8b455	2015-01-08 12:53:09 +01:00
Qt Submodule Update Bot	3439140073	Updated submodules. Change-Id: I1998742ceac59b50864ccec46a6c2f255871ab30 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2014-12-05 10:51:00 +01:00
Qt Submodule Update Bot	1998742cea	Updated submodules. Change-Id: Ib1885ea72539f3bd2df4d4131f0b164b02d4b59f Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2014-12-04 13:50:13 +01:00
Qt Submodule Update Bot	b1885ea725	Updated submodules. Change-Id: I338ee26271c05b612fc58381270ca471db12aaef Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2014-11-27 06:41:45 +01:00