lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-21 04:16:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/5.7.0' into 5.7

Browse Source 
Conflicts:
	.gitmodules

Change-Id: Ibb7ae7927cfd3371bdb77d88df409e6982e43985
This commit is contained in:
Liang Qi
2016-06-10 12:32:03 +02:00
parent 4ace6667f2 6a4d5e4bc8
commit e568a942ec
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitmodules vendored
View File

@@ -164,7 +164,7 @@
path = qtquick1 path = qtquick1
url = ../qtquick1.git url = ../qtquick1.git
branch = 5.7 branch = 5.7
status = obsolete status = ignore
[submodule "qtgraphicaleffects"] [submodule "qtgraphicaleffects"]
depends = qtdeclarative depends = qtdeclarative
path = qtgraphicaleffects path = qtgraphicaleffects
@@ -220,7 +220,7 @@
path = qtenginio path = qtenginio
url = ../qtenginio.git url = ../qtenginio.git
branch = 5.7 branch = 5.7
status = obsolete status = ignore
[submodule "qtwebsockets"] [submodule "qtwebsockets"]
depends = qtbase depends = qtbase
recommends = qtdeclarative recommends = qtdeclarative