summaryrefslogtreecommitdiff
path: root/.qmake.conf
Commit message (Collapse)AuthorAgeFilesLines
* Bump versionOswald Buddenhagen2017-12-201-1/+1
| | | | Change-Id: I4340186e3b148b18c29a3fe68ecf36eacb0d9314
* Bump versionOswald Buddenhagen2017-02-021-1/+1
| | | | Change-Id: I455459eee0d7b4815d1ef88d13581bbda9361a08
* Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-12-121-0/+2
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I6c9ecff3a336c5183aa631e7ce600e99f9594dd5
| * Eradicate Q_FOREACH loops and mark the module as Q_FOREACH-freeMarc Mutz2016-09-231-0/+2
| | | | | | | | | | | | Change-Id: I13a4ce5c268da2b97cbae6612d240398b17186ef Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Bump versionOswald Buddenhagen2016-08-291-1/+1
|/ | | | Change-Id: I9a8f504605ab747c66c50334a31fcb2f679e89d8
* Merge remote-tracking branch 'origin/5.7' into devEdward Welbourne2016-07-281-1/+0
|\ | | | | | | Change-Id: I0a8e242e0c24a67fe60737674dc3a4ecf0936f3a
| * Merge remote-tracking branch 'origin/5.6' into 5.7Edward Welbourne2016-07-261-1/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h One side narrowed a QNX define to Dinkum; the other wanted the same kludges applied for Intel. Combine their changes to the condition. Change-Id: Id44102e53a0f96b7318437fb47fa76d8bc1119f3
| | * do not enable example installs explicitly any moreOswald Buddenhagen2016-05-241-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | it's done centrally now. Change-Id: I8f659fd2676aeedbfe4aaa36b8e9e93c979eee05 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * Bump versionOswald Buddenhagen2016-05-191-1/+1
| | | | | | | | | | | | Change-Id: I7abf5bb8276fea2f75479a7884b5c6ecc3e41ed2
| | * Bump versionOswald Buddenhagen2016-02-081-1/+1
| | | | | | | | | | | | Change-Id: I9e249aa3456a74f5a6a35626ae9bea04ddc5e4e6
* | | Bump versionOswald Buddenhagen2016-02-231-1/+1
|/ / | | | | | | Change-Id: I401cd9db6b487704d54a83b28d5ad1bdea2a3b92
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-10-221-0/+1
|\ \ | |/ | | | | Change-Id: Iabc282a0396f2403a7a89712be279dd8e894df41
| * Avoid headersclean on ARM with Boot2QtSimon Hausmann2015-10-211-1/+1
| | | | | | | | | | | | | | | | This extends commit 5daf90cf1f6ae7f6708649c35b003a87bc7d9f50 to also avoid -Werror with the gcc arm toolchain used for Boot2Qt. Change-Id: Ib2dad074c4d542a4fc22b1e63e2335e1978c02ee Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Dissable headersclean for AndroidBogDan Vatra2015-10-191-0/+1
| | | | | | | | | | | | | | | | For some reason that I fail to understand Android gcc doesn't like it and it breaks the compilation. Change-Id: Iae8d0c73c95464ac2c02b6d660a7eee3e2492e21 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Bump versionOswald Buddenhagen2015-09-101-1/+1
|/ | | | Change-Id: I0cdfb15ac89926c184329ad9e1a3217cdcbba4ef
* Bump versionOswald Buddenhagen2015-02-241-1/+1
| | | | Change-Id: I4ac7681eeef1c84e73ac2162aad5da492f7500b1
* Bump versionOswald Buddenhagen2014-08-091-1/+1
| | | | Change-Id: Ie35bb9482c3294c227b6fd24bc9722501eb8ff84
* Bump module version to 5.4.0Thiago Macieira2014-02-201-1/+1
| | | | | | Change-Id: I87865026484ee72f4d07b6be109cde5f44d0e801 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Bump qtscript version to 5.3.0Thiago Macieira2013-09-241-1/+1
| | | | | Change-Id: I8e11b25e902e1d39e1f3f504c6e86a98d86304b6 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Update module version to 5.2.0Frederik Gladhorn2013-03-281-1/+1
| | | | | Change-Id: I5ddeaa45f53d2a899f65325db2ddd4fdaa2c1be1 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Bump MODULE_VERSION to 5.1.0v5.1.0-alpha1Sergio Ahumada2013-03-251-1/+1
| | | | | Change-Id: I6ee4b5ee37256493ffdff08974ae0c08d7278385 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* define MODULE_VERSIONOswald Buddenhagen2013-02-271-0/+2
| | | | | | Task-number: QTBUG-29838 Change-Id: I3b751565b50c12c5bcd2fab293e8fc9092b1c10b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* centralize and fixup example sources install targetsv5.0.0-rc1Joerg Bornemann2012-12-051-0/+1
| | | | | | | | This follows suit with aeb036e in qtbase. Change-Id: I695c3f7c69cfe811ffe05f7cb381e3216b76e7a8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: hjk <qthjk@ovi.com>
* centralize load(qt_build_config)s in .qmake.confOswald Buddenhagen2012-09-111-0/+1
Change-Id: I1d95fe8089d8384563654630b9f4b201245887b9 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
View Lorry Controller Status