diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-09-18 12:00:07 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-09-18 12:00:07 +0200 |
| commit | 2068af50ca9eb8895e34cb60f67942e100c60432 (patch) | |
| tree | 31c5f51e2bcb74b660fe4013f29c417e71215012 /README.git | |
| parent | 1d3966833b5f27fb262f2d3727557ef2c8947828 (diff) | |
| parent | 2ebfdb4ca80f6738c2720cb261c19fecd65b8b62 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
.gitmodules
qtquickcontrols2
qtwebview
Change-Id: Ic5b78f36511d5e022aacd6ade5d052345bc84d14
Diffstat (limited to 'README.git')
| -rw-r--r-- | README.git | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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 |