From b2f1177661cbc35d64800caca40a4bfb1204fc3f Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 6 Apr 2017 11:19:00 +0300 Subject: [PATCH] Remove 'git checkout 5.*' before 'init-repository'. Something has changed in Qt libraries remote layout so now the perl init-repository script from the old Qt version doesn't work anymore. We init the submodules using script from the latest Qt version and after that we checkout the desired version by tag in all submodules. --- docs/building-cmake.md | 1 - docs/building-msvc.md | 1 - docs/building-qmake.md | 1 - docs/building-qtcreator.md | 1 - docs/building-xcode-old.md | 1 - docs/building-xcode.md | 1 - 6 files changed, 6 deletions(-) diff --git a/docs/building-cmake.md b/docs/building-cmake.md index 3a9a68e6f0..a7c727fde9 100644 --- a/docs/building-cmake.md +++ b/docs/building-cmake.md @@ -133,7 +133,6 @@ In Terminal go to **/home/user/TBuild/Libraries** and run git clone git://code.qt.io/qt/qt5.git qt5_6_2 cd qt5_6_2 - git checkout 5.6 perl init-repository --module-subset=qtbase,qtimageformats git checkout v5.6.2 cd qtimageformats && git checkout v5.6.2 && cd .. diff --git a/docs/building-msvc.md b/docs/building-msvc.md index 431f61d8e8..96d282818d 100644 --- a/docs/building-msvc.md +++ b/docs/building-msvc.md @@ -191,7 +191,6 @@ While still running the VS2015 x86 Native Tools Command Prompt, go to **D:\\msys git clone git://code.qt.io/qt/qt5.git qt5_6_2 cd qt5_6_2 - git checkout 5.6 perl init-repository --module-subset=qtbase,qtimageformats git checkout v5.6.2 cd qtimageformats && git checkout v5.6.2 && cd .. diff --git a/docs/building-qmake.md b/docs/building-qmake.md index 344c9566a0..aeca876889 100644 --- a/docs/building-qmake.md +++ b/docs/building-qmake.md @@ -38,7 +38,6 @@ Preparation rm -rf "$qt_dir" git clone git://code.qt.io/qt/qt5.git cd "$qt_dir" - git checkout 5.6 perl init-repository --module-subset=qtbase,qtimageformats git checkout v$_qtver cd qtimageformats diff --git a/docs/building-qtcreator.md b/docs/building-qtcreator.md index 6d698b455d..379443790e 100644 --- a/docs/building-qtcreator.md +++ b/docs/building-qtcreator.md @@ -129,7 +129,6 @@ In Terminal go to **/home/user/TBuild/Libraries** and run git clone git://code.qt.io/qt/qt5.git qt5_6_2 cd qt5_6_2 - git checkout 5.6 perl init-repository --module-subset=qtbase,qtimageformats git checkout v5.6.2 cd qtimageformats && git checkout v5.6.2 && cd .. diff --git a/docs/building-xcode-old.md b/docs/building-xcode-old.md index a28930d789..21d8e340bc 100644 --- a/docs/building-xcode-old.md +++ b/docs/building-xcode-old.md @@ -184,7 +184,6 @@ In Terminal go to **/Users/user/TBuild/Libraries** and run: git clone git://code.qt.io/qt/qt5.git qt5_3_2 cd qt5_3_2 - git checkout 5.3 perl init-repository --module-subset=qtbase,qtimageformats git checkout v5.3.2 cd qtimageformats && git checkout v5.3.2 && cd .. diff --git a/docs/building-xcode.md b/docs/building-xcode.md index 41d222a1b6..e1c6f0c40a 100644 --- a/docs/building-xcode.md +++ b/docs/building-xcode.md @@ -182,7 +182,6 @@ In Terminal go to **/Users/user/TBuild/Libraries** and run: git clone git://code.qt.io/qt/qt5.git qt5_6_2 cd qt5_6_2 - git checkout 5.6 perl init-repository --module-subset=qtbase,qtimageformats git checkout v5.6.2 cd qtimageformats && git checkout v5.6.2 && cd ..