summaryrefslogtreecommitdiffstats
path: root/scripts/qt
Commit message (Collapse)AuthorAgeFilesLines
...
* Make submodule update handle qt3d properlySergio Ahumada2015-03-131-1/+1
| | | | | | | | qt3d now also has a 5.5 branch in addition to its dev branch Change-Id: Ia546b32bab946cafdf2f23c585d72b75022b5e20 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Update qtenginio's submodule updateSergio Ahumada2015-02-171-0/+1
| | | | | | Change-Id: I2e5f4c2ec42c439b213e27b5cf42f7d66f7d82b9 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
* Update by default branch to 'dev'Sergio Ahumada2015-02-161-6/+6
| | | | | | | the 'stable' branch has been gone long ago Change-Id: Id0b375ffa169433e588f75bd809b2cd080cec4a7 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
* Update copyright headersAntti Kokko2015-02-132-14/+14
| | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I5999ee256134fe82ab13f6f06fcd1d0aa150b688 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* Set enginio branch for Qt 5.4.1Tony Sarajärvi2015-01-201-0/+1
| | | | | | Change-Id: Ia82fd86dbd67a914fab49443c68f0c7a11c7bd6c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Heikki Halmet <heikki.halmet@theqtcompany.com>
* Submodule update bot: Set correct branch for Qt3DSimo Fält2014-11-191-2/+2
| | | | | | | Change-Id: Iff5a801a16811366dd5da6f0b31b272a95cb7da8 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
* Submodule update: Update custom branch mapping to Qt 5.4.0Simo Fält2014-11-051-4/+1
| | | | | Change-Id: Ib2ddfc6c5ead31c0be5210b0571b6a002fea6a95 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* Update license headers and add new license filesAntti Kokko2014-09-222-38/+22
| | | | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 - Removed LICENSE.GPL - Added test reference file header.LGPL21 Change-Id: Ie950b82ff5eebc17cd7f3ce3cbc218d3862a4512 Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* QtQA: Change dev to be as default branch instead of stableSimo Fält2014-09-011-2/+2
| | | | | | | | Some modules may be missing properties required by CI. We need some valid default values to be used. Change-Id: I714f5853e3d031ca28c170e4fda42b58d538f8db Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
* Fix qtenginio branch mapping.Jędrzej Nowacki2014-08-131-1/+1
| | | | | | | | 1.1 branch was created from dev and it supposed to be released together with Qt5.4 Change-Id: I3d63b2636aa0e98b03afb5e53b962114d6509c23 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* added qtenginio 5.4 branch customization to submodule updaterTony Sarajärvi2014-08-131-0/+1
| | | | | Change-Id: I5862301d0d9667bfff1a49566517800a6b234b54 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* add qtwebengine 1.0 custom branch to submodule updaterTony Sarajärvi2014-08-121-0/+4
| | | | | | Change-Id: I0aca04e3f6af45f3d568ff2bdde9b75210c1c31e Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* QtQA: Change relative submodule path to absolute pathSimo Fält2014-07-311-0/+8
| | | | | | | | | While using relative submodule paths for modules under test is not working properly, we can change the path before doing submodule update. Change-Id: I7510400cdbbae0bc38ac1922c3729bccf7335845 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Create a mapping between Enginio and Qt5 branches.Jędrzej Nowacki2014-06-181-10/+26
| | | | | | | | The mapping is supposed to be a temporary workaround until we have a smarter system in place. Change-Id: I42c884cf510a8ab139abf96c095bd46cbdc44bfe Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
* Update qt_update_submodules.pl for qtpim and qlalrSergio Ahumada2014-06-051-2/+1
| | | | | | | | qtpim.git only has a 'dev' branch nowadays qlalr.git was removed as the code was moved to qtbase.git Change-Id: I04a8d2ff5c99c683053efde5133cdaf8ab29ac02 Reviewed-by: Simo Fält <simo.falt@digia.com>
* Qtqa: Configurable script instead of default ci testrunnerSimo Fält2014-05-051-1/+30
| | | | | | | | | | | Some mobile platforms can't be tested with default CI test setup. Instead some of them, like Android Qt port is relying on its own testrunner script. To be able to utilize this in CI, we need a way to run non-default testrunners as well. Task-number: QTQAINFRA-641 Change-Id: I8f59c20d1fc3fbe204f3ac624aad056e68e91c41 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
* Qtqa: Enable blacklisting of submodule updateSimo Fält2014-03-271-8/+24
| | | | | | | | | In some cases we can't clone nested submodules. It seems to relate to git version on CI nodes. Adding QtDeclarative to list to prevent some manual tests to be cloned. Change-Id: Idc0c5643a8e34225483bb4bdbae440c691331911 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
* Skip building of tools in case of xplatform being in configure argsTony Sarajärvi2014-03-051-1/+5
| | | | | | Change-Id: I9823a931a188d55037e9724b5ca93e26c1cbdb31 Reviewed-by: Andrew Knight <andrew.knight@digia.com> Reviewed-by: Simo Fält <simo.falt@digia.com>
* qtmod_test: Fix run_install_check() when cross compilatingSergio Ahumada2014-03-031-2/+2
| | | | | | | | | | | | | | | | run_install_check() assumes that we are doing a Desktop build so it expects the /include/ directory to end up under $(qt.install.dir)/include which is not always true, especially when you are cross compiling and using -sysroot and/or -headerdir which may place the /include/ directory somewhere else. Let's check for 'bin' and 'mkspecs' instead, as it's more likely they end up under $(qt.install.dir) as they are host related artifacts. Change-Id: I29463fa73916d08880bb5f15fa1b6ca721511c43 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com> Reviewed-by: Simo Fält <simo.falt@digia.com>
* Use predefined QMAKEFLAGS from environment variable in buildTony Sarajärvi2014-01-151-1/+2
| | | | | | | | | Instead of creating a local new empty environment variable, we now append new parameters on top of the environment variable which we make local. Change-Id: I228a2badf39b71986b5263aa93d421bd6de2fcec Reviewed-by: Simo Fält <simo.falt@digia.com>
* qtqa: Delete $qt_dir only if neededSimo Fält2013-12-011-1/+3
| | | | | | | | | | | Fix warning which says that script can't remove path when in it. In this case the dir was already cleaned and it shouldn't be deleted again. Task-number: QTQAINFRA-778 Change-Id: Id22501d8ab886799cf873dc2b4588cc94cfcf612 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
* qtqa: Make flaky test mode configurableSimo Fält2013-10-141-4/+11
| | | | | | | | | There has been a request to disable flaky test plugin. We should rely the result of initial test run. Change-Id: I8fa62873ee94b5265d3c572dd734e8fbe451140d Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* QTQA: Added make html_docs stepSimo Fält2013-09-101-0/+45
| | | | | | | | | | CI needs ability to run make html_docs inside defined stage. Added make step and property handling to ignore failures if needed. Change-Id: I87d11184960289716c6614709254457352d0e41e Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
* qtqa: Run submodule update for module under testSimo Fält2013-08-291-0/+8
| | | | | | | | | | | | When fetching all required sources to test one submodule, init-repository script is used for all submodules except for the one being tested. To get its possible submodules as well, we have to run submodule update for it separately. Change-Id: I6f6b79d82faa68fdc8307ae07c8ae1166cf0404c Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Zeno Albisser <zeno.albisser@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* qt_update_submodules: Fix some submodulesSergio Ahumada2013-07-051-3/+0
| | | | | | | | qtconnectivity, qtlocation and qtsystems don't have a master branch anymore, they have switched to use dev/stable/release scheme instead. Change-Id: I7d5101dd6c6dd346ac75ff7f616b5dcb5b9fc71d Reviewed-by: David Faure (KDE) <faure@kde.org>
* Re-enabling revdep tests in ciSimo Fält2013-06-191-1/+1
| | | | | | | | | CI won't be skipping revdep tests if sync.profile has an empty string as a branch. Task-number: QTQAINFRA-614 Change-Id: If255c8752bd3ed9aee2ccbcbfb18c5e4c4880746 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* introduce qt.deps_branch propertyOswald Buddenhagen2013-05-291-1/+6
| | | | | | | | | this allows setting a different default branch for the tested repo's dependencies. this is useful for feature branches which typically exist only in one repo. Change-Id: Id63570900cd141e4f24aa2f23a1f4c0f5dc13a8a Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
* Set qt_update_submodules.pl to use some more master branchesSergio Ahumada2013-05-291-2/+11
| | | | | | | | | | | | | | | | | | | | The following repositories are missing dev/stable/release branches, so Qt submodule update bot will use only its master branch. qlalr qt3d qtconnectivity qtdocgallery qtfeedback qtjsondb qtlocation qtpim qtsystems Change-Id: I42ce2fe764366b0b892ab4368896a246c5aef98a Reviewed-by: David Faure (KDE) <faure@kde.org> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* use an empty string instead of @sameOswald Buddenhagen2013-05-241-1/+1
| | | | | | | | it's less arbitrary and easier to edit. Change-Id: Ib9e7ad35268082775b959ae5afb57fee1316d3f7 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* support @same for dependency referencesOswald Buddenhagen2013-05-241-0/+2
| | | | | | | | | this allows us to uniformly use the same value in all branches, which simplifies merging. Change-Id: I278617762c169814697b49f29b5e363c7a3901f9 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
* Fix for Qt Submodule Update jobsSimo Fält2013-05-131-0/+5
| | | | | | | | | Add qtgitreadonly mirror as baseurl for submodules, which have relative url in .gitmodules. Change-Id: I114aced602358b259e78827345cb534ca30fd354 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Removing the relative submodule path patchSimo Fält2013-05-071-6/+0
| | | | | | | | It doesn't do what it was supposed to do, while we don't have url for the origin remote. Change-Id: Ie903c28b8cea78ef33289ad6cbd6c84c20b7b249 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* qt_update_submodules: Fix remote url for submodulesSergio Ahumada2013-05-061-1/+1
| | | | | | | | | This fixes the error Use of uninitialized value $giturl in substitution (s///) at qt_update_submodules.pl line 272. Change-Id: I599a7f3fbd1aae917f220fb0bea4aa57b12d48fe Reviewed-by: Simo Fält <simo.falt@digia.com>
* don't skip tools from minimalized buildOswald Buddenhagen2013-05-031-1/+1
| | | | | | | | | | | | | the switch to <module>_BUILD_PARTS turned += into = as a side effect. compensate by explicitly including libs & tools. this went unnoticed so far, because the only repo in which an autotest would catch it (qttools) didn't even pay attention to the tools exclusion so far. Change-Id: Ia97c0b881a7028f6f8f6e855224d5110cf9e2f43 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Adding git origin url to be used with relative submodule pathSimo Fält2013-04-301-0/+5
| | | | | | | | | The qt5 repository was fetched without remote url, which prevents using releative submodule spec in .gitmodules with early 1.7.x git versions. Change-Id: I43d5e321756e11c65ce63a80a6f1fb21a70d5d79 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Getting prepared for relative submodule specsSimo Fält2013-04-171-0/+6
| | | | | | | | | | .gitmodules file may have relative submodule paths instead of full url. Change-Id: Ib4f00cb2a75a00ffdb7465b669354e0bf7bab1f9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* qt_update_submodules: Fix qtx11extras submoduleSergio Ahumada2013-03-291-1/+0
| | | | | | | | qtx11extras doesn't have a master branch anymore, dev and stable were created and are in use instead. Change-Id: Ifd877ea7d40956f6a585bf327180032e7138065b Reviewed-by: David Faure (KDE) <faure@kde.org>
* make use of <module>_BUILD_PARTSOswald Buddenhagen2013-03-221-28/+12
| | | | | | | | | this avoids the nasty hack of running qmake in a submodule before its dependencies have been built. Change-Id: I75d2bdab7682e07bce2ef1a4807fb28672d8c4cf Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* qtqa: Set qt_update_submodules.pl to use qtx11extras' master branchSimo Fält2013-03-041-0/+1
| | | | | | | | | QtX11Extras is missing dev/stable/release brances, so Qt submodule update bot is usign only its master branch. Change-Id: I7400864cd7bb66543604e8b339d56a6e65862f9b Reviewed-by: Liang Qi <liang.qi@digia.com> Reviewed-by: David Faure (KDE) <faure@kde.org>
* Use make-check.bin instead of make.bin when running testplanner.pl.Janne Anttila2013-02-271-1/+1
| | | | | | | | | | | | | Running testplanner.pl with jom fails with error: "testplan generation failed". Since we want to use jom for building Qt libraries, changed testplan generation to use make-check.bin which is always the actual make i.e. nmake/mingw32-make on Windows. Change-Id: I9f4efe7d63d5c211f1dd98a7a3832c51cb4cd4b3 Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Samuli Piippo <samuli.piippo@digia.com> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* QtQA: Added configurable parameter for test dirSimo Fält2013-02-141-1/+6
| | | | | | | | | | | By using qt.tests.dir parameter one can define where the build will run the tests. Default is the submodule root, as it is now. Affects only qt5 builds. Change-Id: I7c7f5610f092f4510a0880d3df9af70bfe814b93 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-142-2/+2
| | | | | | Change-Id: I02eaa709ff91d158a3e34f4e719254f2adce873e Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* qtmod_test: Use stable branch instead of master by defaultSergio Ahumada2012-12-141-5/+5
| | | | | | | | | | | | | | | | | | | | | There are three use cases that may require the stable branch: - to use it when there is no sync.profile or explicit dependencies qtbase.git does not have a master branch nowadays, so pointing to stable is a must (eg. for qtqa.git) - to handle the revdep configurations branches qtbase.git does not have a master branch nowadays, but this should be already fixed in testconfig.git - to clone the qt5.git supermodule qt5.git still has a master branch, but it could be removed at any time. Change-Id: Idd26cd3d924bc0002c395dc75b0f38cbdb8e219c Reviewed-by: Samuli Piippo <samuli.piippo@digia.com> Reviewed-by: Rohan McGovern <rohan@mcgovern.id.au> Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* Allow qt_update_submodules.pl to track and update any branchSergio Ahumada2012-12-101-6/+13
| | | | | | | | | | | | qt/qtqa.git and qt/qtrepotools.git don't have a 'dev/stable' branch at the moment, so they need to track 'master'. qt/qtquick3d.git is obsolete, so it was removed. Change-Id: I0134ad0d79aa98649bff17d6b688e3ac7ef31125 Reviewed-by: Rohan McGovern <rohan@mcgovern.id.au> Reviewed-by: Samuli Piippo <samuli.piippo@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* Adding configurable property for sync.profileSimo Fält2012-11-271-1/+10
| | | | | | | | | | | QtWebkit is having its sync.profile in non-default directory. Added property for giving additional sub-dir name. Change-Id: I77ded6018ad9ea9af9094c5a98f03e3d74003756 Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Samuli Piippo <samuli.piippo@digia.com> Reviewed-by: Rohan McGovern <rohan@mcgovern.id.au> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Adding qt.dir to be removed if existing.Simo Fält2012-11-271-12/+7
| | | | | | | | | While qt.dir can be configure to be outside base.dir, we should clean it up. Change-Id: Ib2f80ef426510cd486544eaae382f71b216ba095 Reviewed-by: Rohan McGovern <rohan@mcgovern.id.au> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* Use qtgitreadonly when cloning qt5.gitSamuli Piippo2012-11-201-3/+8
| | | | | | | | | Instead of using gitorious directly, use the qtgitreadonly: configuration to clone qt5.git if it is configured to git Change-Id: Ie161a506bf30fd5331daa616a391e927275d72ae Reviewed-by: Rohan McGovern [inactive] <rohan.mcgovern@nokia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* qt_update_submodules: fixed double quoting of gerrit commentsRohan McGovern2012-10-251-8/+0
| | | | | | | | | | | QtQA::Gerrit::review already takes care of quoting internally, so we no longer need to do it explicitly here. This was resulting in leading and trailing " characters in the posted comments. Change-Id: I7a41961161183ee7a9d1a806fac43bbc2d5dbb7a Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Samuli Piippo <samuli.piippo@digia.com> Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
* qt_update_submodules: use QtQA::Gerrit to simplify codeRohan McGovern2012-10-221-118/+22
| | | | | | | | Some shared functionality was added to the QtQA::Gerrit module. Use that instead of duplicating the code. Change-Id: I27cc95d17f0892f7b14de1968355133b12590ba6 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* qt_update_submodules: removed Nokia-specific argumentsRohan McGovern2012-10-191-12/+0
| | | | | | | | | Removed usage of -(brisbane-)nokia-developer. To use a git mirror, instead put "--mirror <something>" in qtqa.qt.init-repository.args. Change-Id: I389d5a7f3c7282446a26b037f12799964b83ba77 Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 14:08:33 +0000