Gerrit and qt5_tool
-
Hi All,
When trying to pull the dev branch using 'qt5_tool -p --branch dev' I am running in the problem that he is trying to fetch from
gerrit. Because of the lack of an gerrit account, this fails.Is it strictly necessary to have a gerrit account to use the qt5_tool in this way l or did I do anything strange. I simply would like to test some new stuff from Qt 5.0.2.
Thanks
Mike -
Checkout dev branch in Qt5 repo and update. This should give you pretty decent state of Qt5.1.
-
Thanks for your answer sierdzio, but I think it was not working. I did the following:
@
$ git checkout -b dev remotes/origin/dev
Branch dev set up to track remote branch dev from origin.
Switched to a new branch 'dev'
$ git pull
Already up-to-date.
$ git submodule sync
Synchronizing submodule url for 'qtactiveqt'
Synchronizing submodule url for 'qtbase'
Synchronizing submodule url for 'qtdeclarative'
Synchronizing submodule url for 'qtdoc'
Synchronizing submodule url for 'qtgraphicaleffects'
Synchronizing submodule url for 'qtimageformats'
Synchronizing submodule url for 'qtjsbackend'
Synchronizing submodule url for 'qtmultimedia'
Synchronizing submodule url for 'qtqa'
Synchronizing submodule url for 'qtquick1'
Synchronizing submodule url for 'qtrepotools'
Synchronizing submodule url for 'qtscript'
Synchronizing submodule url for 'qtsvg'
Synchronizing submodule url for 'qttools'
Synchronizing submodule url for 'qttranslations'
Synchronizing submodule url for 'qtwebkit'
Synchronizing submodule url for 'qtwebkit-examples-and-demos'
Synchronizing submodule url for 'qtx11extras'
Synchronizing submodule url for 'qtxmlpatterns'
$ git submodule update --recursive
$
@after that I guess I should be on the dev branch which was committed into the qt5 parent repo - but it looks strange when I check it via
@
2$ git submodule
a5d94eb2207d5134343a05f830b6ff062553205f qtactiveqt (v5.0.0-12-ga5d94eb)
90361fd36c803c4c5c28d67f05ed66f619e0d39c qtbase (v5.0.0-541-g90361fd)
08a83c42ad441044c669c909fecd80529d02df5a qtdeclarative (v5.0.0-100-g08a83c4)
90ccab05608e43c0d5f09ef6e62237c53eca2053 qtdoc (v5.0.0-18-g90ccab0)
0bd009dfadb2e2187b29ebd27a6e6fdf8ff89c66 qtgraphicaleffects (v5.0.0-5-g0bd009d)
313d60c107d9659efd5e93ba5a036054f6b1ebba qtimageformats (v5.0.0-2-g313d60c)
49fd16b31c8137ea50f06c0cf61f843f1d6f6116 qtjsbackend (v5.0.0-29-g49fd16b)
a0707d50cd792a6fd75b28fd0dd80b9801fc0990 qtmultimedia (v5.0.0-15-ga0707d5)
2fe57b53de3e8c8aa5f937bdc18549db9999efd6 qtqa (v5.0.0-beta1-101-g2fe57b5)
ae764c678c78c1e3530a6d0dc2de2a17c5d4815a qtquick1 (v5.0.0-26-gae764c6)
d8551dda06e4f3dbf3b7aab347a4b6449d5772f4 qtrepotools (v5.0.0-beta1-72-gd8551dd)
7e1803d382fd199bae12c8e13cd710e51e633a09 qtscript (v5.0.0-12-g7e1803d)
5a5c91eade5f356209389f3d99cd36b7ac9ac683 qtsvg (v5.0.0-13-g5a5c91e)
6afde37f3e3dfe707dcaf81994d34e94f74d9537 qttools (v5.0.0-30-g6afde37)
247ba8153251422622f89246a0af316dcde486fb qttranslations (v5.0.0-beta2-18-g247ba81)
f28064fa297a1eb61d5311bbc1e8b8f3d66096bd qtwebkit (v5.0.0-34-gf28064f)
a34f4dcb275f383d073fea11457e5bf88c199dee qtwebkit-examples-and-demos (v5.0.0-9-ga34f4dc)
ad74017647aab6232abebed0e10aa731a9d536d1 qtx11extras (ad74017)
37f34eb393d750c310e93e95b964a28a0118ad3a qtxmlpatterns (v5.0.0-12-g37f34eb)
@It seems that the dev branch of the parent was not updated for some time. In addition to that I also tried git submodule foreach "git checkout -b dev remotes/origin/dev", but this is not working because not every submodule has a dev branch.
Any suggestion ?
Mike
-
There is a difference between dev for qt5.git (pointing to specific commits in the submodules) and dev for the specific submodules.
If you want dev as in the development branch of each submodule you want the latter.
Unfortunately, and as you've already found out, qtqa and qtrepotools do not have a dev branch. There is some funky git command to handle this which I can't seem to remember so what I usually do is the following:
@once to checkout a specific branch
mv qtqa qtqa_
mv qtrepotools qtrepotools_
git submodule foreach --recursive git checkout dev
mv qtqa_ qtqa
mv qtrepotools_ qtrepotoolssubsequent to pull from origin
git submodule foreach --recursive git pull
@
Brain to terminal. -
It worked :-) My test code was an openGL geometry shader, and this feature is only supported in the current dev branch...
I used the following set of modules:
$ git submodule
+27cbc14bad01ce78458e3bd42ec8fb6e63e9a48f qtactiveqt (v5.0.1-16-g27cbc14)
+341fb50d5b4433193b47cffa0d513f633d9978cd qtbase (v5.0.1-1063-g341fb50)
+c4cbb1249fa7cb754de4603f5ff606aa94fafbd5 qtdeclarative (v5.0.1-188-gc4cbb12)
+a85d35e69cee1cbeaabda4bd7e7a7fe680bf6638 qtdoc (v5.0.1-25-ga85d35e)
+db4289240d1f031a218871bb78a2da59e58f7244 qtgraphicaleffects (v5.0.1-11-gdb42892)
313d60c107d9659efd5e93ba5a036054f6b1ebba qtimageformats (v5.0.0-2-g313d60c)
+74789955e363144418947d7711174083dbd14504 qtjsbackend (v5.0.1-48-g7478995)
+909a09069fbdec8d99cf91f505ca8c925a0e2ccd qtmultimedia (v5.0.1-67-g909a090)
2fe57b53de3e8c8aa5f937bdc18549db9999efd6 qtqa (v5.0.0-beta1-101-g2fe57b5)
+4c5520d868d0b3d90fb08e96e87aaf6731e00342 qtquick1 (v5.0.1-28-g4c5520d)
d8551dda06e4f3dbf3b7aab347a4b6449d5772f4 qtrepotools (v5.0.0-beta1-72-gd8551dd)
+d022aa7a7645b60579764125061bcf7cebe04087 qtscript (v5.0.1-20-gd022aa7)
+79110679d66a903e5d177aa2aa2959f6abbacb9d qtsvg (v5.0.1-17-g7911067)
+b2dec1e4ecdaa33e8f7d933caf0558a31dfc681f qttools (v5.0.1-50-gb2dec1e)
247ba8153251422622f89246a0af316dcde486fb qttranslations (v5.0.0-beta2-18-g247ba81)
+1d6a09105b8a583893c6bef5089719389a9e62f5 qtwebkit (v5.0.1-60-g1d6a091)
+2787eb059134ed289f3ad7c386a1501e0ddd6e9c qtwebkit-examples-and-demos (v5.0.1-9-g2787eb0)
ad74017647aab6232abebed0e10aa731a9d536d1 qtx11extras (ad74017)
+648b1846d9bd6d7aac65095c21bd2c6d72bfa408 qtxmlpatterns (v5.0.1-20-g648b184)Thanks again
Mike
