summaryrefslogtreecommitdiff
path: root/.qmake.conf
Commit message (Collapse)AuthorAgeFilesLines
* Bump versionOswald Buddenhagen2017-12-201-1/+1
| | | | Change-Id: Id26e54719ca5b7234bda37f2901edd806b989ce6
* Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-06-071-0/+1
|\ | | | | | | | | | | | | | | Conflicts: .qmake.conf src/plugins/geoservices/geoservices.pro Change-Id: Ie82dd22c588e5cba409fc1ef31a65968ce9f719b
| * Bump versionOswald Buddenhagen2017-05-101-1/+1
| | | | | | | | Change-Id: If60d65fa0397abc882404e6103020e656978b128
| * Mark qtlocation as warning-freeThiago Macieira2017-04-121-0/+1
| | | | | | | | | | | | | | | | | | This will turn -Werror on for our tested compilers, to avoid introducing new warnings. Change-Id: I27b55fdf514247549455fffd14b17ae6dce9976f Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Bump versionOswald Buddenhagen2017-02-021-1/+1
|/ | | | Change-Id: I44726cf7e103280f7702c1c8d7847f192e6cc8bd
* Bump versionOswald Buddenhagen2016-08-291-1/+1
| | | | Change-Id: I5a977ebfd82f17eadd01ef10a0eed34c82bf50e8
* Merge remote-tracking branch 'gerrit/5.7' into devAlex Blasche2016-06-031-1/+0
|\ | | | | | | Change-Id: Ica8afd5e07240d2279a0f098cc03f8443663a209
| * Merge branch '5.6' into 5.7Alex Blasche2016-05-261-2/+1
| |\ | | | | | | | | | Change-Id: If8d408079ba6cceffd516c0ed95a21a2ca1ca2a0
| | * do not enable example installs explicitly any moreOswald Buddenhagen2016-05-251-1/+0
| | | | | | | | | | | | | | | | | | | | | it's done centrally now. Change-Id: Idbf9bf3cf304240ef6c28217199b2a32c68d581d Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| | * Bump versionOswald Buddenhagen2016-05-191-1/+1
| | | | | | | | | | | | Change-Id: I883d4601a05a9e07b101af10c1301e77085966b6
| | * Bump versionOswald Buddenhagen2016-02-081-1/+1
| | | | | | | | | | | | Change-Id: Ic22c20e0be86b3904e8b60b713a80dd867eceee0
* | | Bump versionOswald Buddenhagen2016-02-231-1/+1
|/ / | | | | | | Change-Id: Ibdc5b8f68737ce6340ef0f2e8395feb172ad8114
* | Bump versionOswald Buddenhagen2015-09-101-1/+1
|/ | | | Change-Id: Ia6c56bef237910c43ddb015e0b72662b209d29a3
* Bump versionOswald Buddenhagen2015-02-241-1/+1
| | | | Change-Id: I74f097dc17eded0bb207f8234949d9b54e91b441
* Bump versionOswald Buddenhagen2014-08-091-1/+1
| | | | Change-Id: I288844b6432406c166582a50a5438a751860e957
* Bump module version to 5.4.0Thiago Macieira2014-02-201-1/+1
| | | | | | Change-Id: Ibf905315269a157cb85f618c3b3480f0fc57d3ce Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-11-291-0/+1
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I3c90652f618afcf6a5f26232558843b8e26d8164
| * Fix make install rules for all examples in QtPositioningAlex Blasche2013-11-291-0/+1
| | | | | | | | | | | | | | | | This was highlighted during the testing of the Qt 5.2.0 package. Change-Id: Iab1e6f5f1e1a8ceb62fc44658ec12fb131ccad65 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * Bump MODULE_VERSION to 5.2.1Sergio Ahumada2013-11-261-1/+1
| | | | | | | | | | | | | | Change-Id: I73b42c27dfb256818f650d090586fe8bc7db6a2c Reviewed-by: Matti Paaso <matti.paaso@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Bump qtlocation version to 5.3.0Thiago Macieira2013-09-251-1/+1
|/ | | | | Change-Id: I5b8af17d3aa5846d405958fea05bdadc7988464c Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Set proper QtLocation version and don't build tests depending on Qt3dAlex Blasche2013-06-101-1/+1
| | | | | | | | QtLocation version is anticipated to be Qt 5.2 (time will really tell) Change-Id: I16fa0501489c10515286bb17e19336ac4141ff8d Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com> Reviewed-by: Alex <alexander.blasche@digia.com>
* define MODULE_VERSIONOswald Buddenhagen2013-03-051-0/+2
| | | | | | Task-number: QTBUG-29838 Change-Id: I2c003c7bacbca2b0ce674852cc90b8e57bf7ed3d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* centralize load(qt_build_config)s in .qmake.confOswald Buddenhagen2012-09-131-0/+1
Change-Id: Icbf4870866053bb6812f6ff0084744d6c2566e6f Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
View Lorry Controller Status