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

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

Browse Source 
Conflicts:
	.gitmodules

Change-Id: If63e4f4f7d9a7ddba01d4e621fe6bfbc60838d26
This commit is contained in:
Liang Qi
2016-04-05 09:52:18 +02:00
parent a550ad21bf e80d89059c
commit 5758a88e59
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitmodules vendored
View File

@@ -28,7 +28,7 @@
path = qtscript
url = ../qtscript.git
branch = 5.7
status = addon
status = deprecated
[submodule "qtmultimedia"]
depends = qtbase
recommends = qtdeclarative
@@ -220,7 +220,7 @@
path = qtenginio
url = ../qtenginio.git
branch = 5.7
status = obsolete
status = deprecated
[submodule "qtwebsockets"]
depends = qtbase
recommends = qtdeclarative