summaryrefslogtreecommitdiffstats
path: root/.qmake.conf
Commit message (Collapse)AuthorAgeFilesLines
* cmake: remove qmake build system (except in examples/)Robert Griebl2021-06-301-14/+0
| | | | | Change-Id: I8d00047f8e03bb77863041eaa99f1bba13a15a32 Reviewed-by: Dominik Holland <dominik.holland@qt.io>
* Qt 6 port, part 1 .. without cmakeRobert Griebl2020-11-281-1/+1
| | | | | | | | | All C++ and QML unit-tests pass. The QML "windowitem" test is very unstable though and often crashes in the RHI layer. Change-Id: Ia42fc71ad69d2ba74b8b631ded7569b48cf458ee Reviewed-by: Robert Griebl <robert.griebl@qt.io>
* Version bump to 5.15.1Robert Griebl2020-09-171-1/+1
| | | | | | Change-Id: Ia618140d5296ff6f65e7e46f1256aaad10ad8a06 Task-number: AUTOSUITE-1625 Reviewed-by: Robert Griebl <robert.griebl@qt.io>
* Version bump to 5.15.0Robert Griebl2020-05-271-1/+1
| | | | Change-Id: I48445b6053bcbe0611f1ac0b5474b1e756721542
* Version bump to 5.14.2Robert Griebl2020-04-071-1/+1
| | | | | | Task-number: AUTOSUITE-1541 Change-Id: I20ce306148125c9c993d46a2a0c0d82d587878cf Reviewed-by: Dominik Holland <dominik.holland@qt.io>
* Merge remote-tracking branch 'gerrit/5.13' into devRobert Griebl2019-07-311-0/+2
|\ | | | | | | Change-Id: Ia41bd7ca050f0d083f5bfdf83ec7bce227d1e01e
| * Fix CI compilationRobert Griebl2019-07-251-0/+2
| | | | | | | | | | Change-Id: I9ebb9f0d51a2e874bcb0cdd45844042fdecd566c Reviewed-by: Bernd Weimer <bernd.weimer@pelagicore.com>
* | Version bump to 5.14Robert Griebl2019-05-281-1/+1
|/ | | | | | Change-Id: I819386f50c1c1a6212e9f90d1cfde034240f7ee3 Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
* dev is 5.13 nowRobert Griebl2018-11-291-26/+1
| | | | | Change-Id: I4bedb8bb3a787c0fc109b0997ea7e98b0fe32def Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
* The minimum supported Qt version is 5.11.2 right nowRobert Griebl2018-10-261-0/+25
| | | | | Change-Id: Ie279690414939f20b17afece6fac92f6e1936deb Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
* Merge remote-tracking branch 'tqc/5.11' into devRobert Griebl2018-04-101-1/+1
|\ | | | | | | Change-Id: I716618814bd3696fdfd5bfc7827b83a026dc013a
| * Bump version to 5.11.0Robert Griebl2018-04-101-1/+1
| | | | | | | | | | Change-Id: I3133ca904b7a4f1cf9f4e76900619aced49b2d9a Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
* | QtAM 2.1.0 is the version being developed on the dev branch from now onRobert Griebl2017-09-141-1/+1
|/ | | | | Change-Id: I70065824c8534e1ef4d446ccb695fde20b016e35 Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
* QtAM 2.0.0 is the version developed on the 5.10 branch from now onRobert Griebl2017-09-071-1/+1
| | | | | Change-Id: I4606d340d63a47c53a31a0bd5d396babb87ac0b3 Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
* Adjusted the MODULE_VERSION for the QtAS 1.1 releaseRobert Griebl2017-02-021-1/+1
| | | | | Change-Id: I2d85af99b3b77f56bd76914f2a1efd15396f4cef Reviewed-by: Thomas Senyk <thomas.senyk@pelagicore.com>
* Build fix for windowsDominik Holland2017-01-031-1/+1
| | | | | Change-Id: Idafeabf1b1e38413dfea01238aebd1c4e8b84bf5 Reviewed-by: Wolfgang Bremer <wolfgang.bremer@pelagicore.com>
* Fixed and simplified the "make check-coverage" build target5.7Dominik Holland2016-11-301-0/+5
| | | | | | | | | | | | | Instead of collecting all coverage information manually by navigating thru all sub-trees, we now let lcov recursive scan all folders. This has the advantage that the code coverage always contains the complete code base without the need for manually updating the pro files. Also the check-branch-coverage got removed and branch-coverage is now automatically part of the check-coverage target Change-Id: I027d1285121b7584ba48ad5b9435fcf7757d4f2a Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
* Reimplemented build-system as a real Qt moduleRobert Griebl2016-10-171-2/+3
| | | | | | | | | | This should help with doc generation and actually running the unit-tests in the CI system. Please note that the binaries are now installed into $$[QT_INSTALL_BINS] Change-Id: I6f27ba39f8e5d923e1aeff550ba11c1fbd8ac5cf Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
* Split base.pri into separate features that are loaded on demand.Robert Griebl2016-01-181-2/+1
| | | | | | | | This makes the whole build-system more maintainable, plus it speeds up qmake runs. Change-Id: I0020f6ba9250bdb101530bcce9fc804110fc3bb2 Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
* Pelagicore un-brandingRobert Griebl2015-12-081-0/+2
| | | | | Change-Id: I3cd4fee0ff7af6485740fe04308feb25ce96a483 Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
* Initial commit of Pelagicore's ApplicationManager with squashed history.Robert Griebl2015-10-261-0/+5
(minus all 3rd party stuff - we will re-add them later, potentially changing the way some of them are handled completely) Change-Id: I55f15b12f0dbe0c4f979206eaa163d4793ff7073 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>