-
Liang Qi authored
Conflicts: doc/src/external-resources.qdoc doc/src/legal/3rdparty.qdoc doc/src/legal/licenses.qdoc doc/src/platforms/ios.qdoc doc/src/platforms/osx.qdoc doc/src/qt5-intro.qdoc Change-Id: Ic021fa910795062c0f63f6263a2ab1441173488b
cfc96b57