aboutsummaryrefslogtreecommitdiffstats
path: root/qmake-features
Commit message (Collapse)AuthorAgeFilesLines
* [build] change neptune git infoGrigorii Zimin2019-08-081-0/+24
| | | | | | | | | | | | Change neptune git info according to the following rules: 1) if current commit corresponds to tag -- tag is shown 2) if current commit doesn't correspond to tag and branch is specified -- BRANCH-COMMIT format is used 3) if current commit doesn't correspond to tag and branch is not specified -- COMMIT format is used 4) if OS is not unix/git folder or git is absent then "unknown revision" is shown Change-Id: Ie6a6959ca68ad4d5dfa49a7708bdd48ce96f3c6a Fixes: AUTOSUITE-1149 Reviewed-by: Bramastyo Harimukti Santoso <bramastyo.harimukti.santoso@pelagicore.com>
* [build-system] EXTRA_FILES always need to be absolute pathsDominik Holland2019-05-311-6/+1
| | | | | | | | | | Don't try to be smart when iterating over EXTRA_FILES and detect where it is located. All files in EXTRA_FILES need to be absolute paths now. Change-Id: I0b490a253ac0f947d87f9ae0fe304b0b0681c941 Fixes: AUTOSUITE-998 Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
* [build-system] Fix in-tree buildsDominik Holland2019-05-231-20/+17
| | | | | | | | | | | | Make the qmlplugin.prf more flexible by always using EXTRA_FILES instead of having a second special rule for the qmldir file. In case a qmldir exists it will be automatically added to EXTRA_FILES. The EXTRA_FILES can now also be part of another folder, which is needed for the future when qmlplugins are autogenerated as well and the qmldir files are part of the build folder. Change-Id: I0b310a19f611e8e5d7cb65de5de9fe06cfaf01e1 Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
* [harness] use qmlscene in case qmllive is not availableBramastyo Harimukti2019-03-281-1/+2
| | | | | Change-Id: I8e65ed57fb50367fcdbe6e8135602fa245b2fe7f Reviewed-by: Egor Nemtsev <enemtsev@luxoft.com>
* [harness] add vehicle app harness wrapperBramastyo Harimukti2019-03-251-1/+10
| | | | | Change-Id: I473407ffdddd0967e0414e08ebbc92f7f7912f32 Reviewed-by: Egor Nemtsev <enemtsev@luxoft.com>
* [harness] improve the cluster harness by moving them back to testsBramastyo Harimukti2019-03-251-4/+4
| | | | | | | | - this way the app folder are not polluted by unnecessary files when it is built Change-Id: Ie91c4d00b93a45111f070aeb53ec3124c417270c Reviewed-by: Egor Nemtsev <enemtsev@luxoft.com>
* [harness] initial harness wrapperBramastyo Harimukti2019-03-222-0/+29
| | | | | | | | | | -introduces the harness wrapper that runs qmllive and load the cluster harness workspace to support rapid UI development Change-Id: Ib139c6ab4387cf815e5552fabf210c8637c44518 Reviewed-by: Grigorii Zimin <gzimin@luxoft.com> Reviewed-by: Egor Nemtsev <enemtsev@luxoft.com>
* Fix neptune3 on androidDominik Holland2018-11-231-3/+21
| | | | | | | | | | | | | | | With the recent import path refactorings the deployment for android got broken. This fixes the paths for the C++ plugins to let them be deployed by androiddeployqt all QML only modules are deployed as normal assets and are imported using appman. To correctly deploy the controls plugin which has mixed content (QML + C++) the qmlplugin.prf got improved to copy the needed files to the build folder, which should also help to start neptune3 from the build-folder. Change-Id: I6d875702d67c80a0a6f4ce8bde00a62eb1d8abcb Reviewed-by: Bramastyo Harimukti Santoso <bramastyo.harimukti.santoso@pelagicore.com> Reviewed-by: Daniel d'Andrada <daniel.dandrada@luxoft.com>
* [sysui] update the imports to use imports_system and imports_sharedBramastyo Harimukti2018-10-171-4/+4
| | | | | | | | | - in the current implementation, applications are able to import components related to the system. this patch is to prevent that situation and have a better separation between applications and system Change-Id: Ic9ca41aa8b789a74d7b3a8df4686faa61bf702af Reviewed-by: Daniel d'Andrada <daniel.dandrada@luxoft.com>
* Do not use RPATH padding when cross-compilingSamuli Piippo2018-09-281-1/+1
| | | | | | | | | Cross-compilers on Windows fail when the RPATH has non-existing paths. error: no such file or directory: 'long_padding/long_padding...' Task-number: AUTOSUITE-646 Change-Id: Ie6d2e55c8815277ea998e3c9533e9fd9b2a6ffe1 Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
* [android] Port Neptune3 for AndroidAntti Hölttä2018-07-181-2/+4
| | | | | | | | | Make Neptune runnable on android. Not fully featured, but at least showing the general look and some basic apps. Change-Id: I27958a377c36958001015983f712d4abcb391db7 Reviewed-by: Lukáš Tinkl <ltinkl@luxoft.com> Reviewed-by: Bramastyo Harimukti Santoso <bramastyo.harimukti.santoso@pelagicore.com>
* Fix build and run issues on windowsDominik Holland2018-04-191-1/+1
| | | | | | Change-Id: Ibf98f8c39b4815411c9edca623fcaa9bc7ad710d Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> Reviewed-by: Bramastyo Harimukti Santoso <bramastyo.harimukti.santoso@pelagicore.com>
* Replace "Triton" occurrences with "Neptune"Bramastyo Harimukti2018-03-061-1/+1
| | | | | | | | - replace all Triton occurrences with Neptune as project name is now changed to Neptune 3 Change-Id: Ia4b2ab7dbee849aec6da86a0223471293a9f8c95 Reviewed-by: Daniel d'Andrada <daniel.dandrada@luxoft.com>
* Initial commit of Triton-UIBramastyo Harimukti2018-02-281-0/+25
Change-Id: I5e52c152e94a0980fc51b35304c44caeb01beecd