summaryrefslogtreecommitdiff
path: root/sync.profile
AgeCommit message (Collapse)AuthorFilesLines
2014-03-06Unpin qtbase and qtdeclarativeSergio Ahumada1-2/+2
...both merges are already in Change-Id: Ib6a43a88e6a10d0db0c5f471b74709ac9ee5b419 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-03-05Pin qtdeclarative in order to allow for the qtdeclarative stable -> dev ↵Sergio Ahumada1-1/+1
merge to go through Change-Id: Idceca103d6cc8e0cac254bdd2eb25be0f6bb0840 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-03-04Temporarily pin qtbase similar to qtdeclarativeSimon Hausmann1-1/+1
Change-Id: I95b101670fd4f767d311ea015d0836f6d09931aa Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-08-13sync.profile: Remove dependency on qtjsbackendSergio Ahumada1-1/+0
Change-Id: I80094d55cfc91e9c470ecc5da7be30450714aa58 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-05-26sync.profile: Point dependencies to an empty stringSergio Ahumada1-4/+5
This means that we are going to use the same branch name for the dependencies as the branch of the repository under test. If we are testing the 'stable' branch, all dependencies will point to the 'stable' branch as well. Change-Id: Ia4afe46fdc798f3e037fdc84cb48886ee60d5112 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
2013-03-25Merge branch 'dev' into stableSergio Ahumada1-4/+4
This starts Qt 5.1 release cycle Conflicts: src/qtdesktop/CheckBox.qml src/qtdesktop/doc/qtdesktopcomponents.qdocconf Change-Id: Ic3799053a18b0a3f97e251354ad8433438b08a7a
2013-01-17Depend on dev branch (Qt 5.1)Frederik Gladhorn1-4/+4
For actions to work the components will have to depend on the dev branch. This mainly affects how tests are run. Change-Id: Ic385647bd6e2f22cdfaa7d94ee6286346a8bea31 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2012-12-15point dependencies to stable branchesSergio Ahumada1-4/+4
Change-Id: Id55a3e36cbb7890fd57c26d8f51bd0a9e280ebf1 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
2012-12-05Modularized for Qt 5Liang Qi1-1/+0
Still missing sth from qmake, it doesn't support non c++ module correctly yet(there is no CXX_MODULE in our project). Change-Id: I9a6a754e863b51b3e3a4b1eaf864ddab24e92f75 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2012-11-12Update sync.profile - List also all indirect dependencies.Janne Anttila1-0/+2
Apparently sync.profile needs to list also all indirect dependencies, i.e. the dependecies needed to build qtdeclarative. Change-Id: I214ed83226cbc24007ebc3300f011f8538cea30c Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
2012-11-09Add sync.profile for CIFrederik Gladhorn1-0/+15
This file describes the build deps for desktop components. Change-Id: I12b6545bc0733b06193a062702f10bc4f2098843 Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 07:45:48 +0000