summaryrefslogtreecommitdiff
path: root/.gitmodules
Commit message (Collapse)AuthorAgeFilesLines
* Remove tracking branch from qface submoduleDominik Holland2020-02-251-1/+0
| | | | | | | | | | | Usually we always use a commit in the upstream/develop branch, but for the 1.10 bugfix, we need to switch the branch. To make our life easier, remove the tracking branch completely to accept any sha in the CI. Change-Id: Ieb9e003691d4ffab0e1f73737b70936574066877 Reviewed-by: Robert Griebl <robert.griebl@qt.io>
* Add taglib as 3rdPartyDominik Holland2018-02-201-0/+4
| | | | | | | | | | This makes the the ivimedia simulator backend work properly on all tier1 platforms. It can be configured using the --taglib configure option. Possible values are: no, qt and system Change-Id: I52f8589a5235ac8d4776bf46709fd88e4fc2022a Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
* Update qface to the latest 'develop' versionDominik Holland2017-07-271-1/+1
| | | | | | | Also update the tracking branch to 'upstream/develop' Change-Id: I0ef3a6433a0b4d05555b927f9b010f097d5b5cf7 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Initial integration of QFace as Git submoduleKevin Funk2017-05-241-0/+4
The submodule will be checked out at: src/3rdparty/qface The build system takes care of bootstrapping qface using `pip3 install -e /path/to/qface` in a Python virtualenv to not pollute the user environment. For using qface from this virtualenv, the user has to activate it first, e.g. with: source qtivi_qface_virtualenv/bin/activate Adapted autotest.sh to make use of the virtualenv activation The build of the internal QFace can be disabled via: CONFIG+=no_internal_qface Integration of win32-g++ has been disabled for now, because of weird build issues on windows 7 + mingw. Task-number: QTAUTO-294 Change-Id: I1fef9482509a54a12b4dc3f2f8e7487646b2076f Reviewed-by: Wolfgang Bremer <wolfgang.bremer@pelagicore.com>