summaryrefslogtreecommitdiff
path: root/.qmake.conf
Commit message (Collapse)AuthorAgeFilesLines
* Remove .qmake.conf from this repositoryJoerg Bornemann2021-09-211-6/+0
| | | | | | | | | | | | | | This file was necessary for the qmake build and the CI. The qmake build is history, and the CI does now read .cmake.conf (see QTQAINFRA-4392). In addition to being superfluous, the existence of .qmake.conf triggers QTBUG-76140 when building Qt examples with qmake. Removing the file alleviates the symptoms of this bug. Fixes: QTBUG-92271 Change-Id: I5de99bfe0a52ac1e1fa04fac3df57d5bb28755b6 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Bump versionJani Heikkinen2021-09-141-1/+1
| | | | Change-Id: I0cf8f58da27200bcbae6fb7821050215fc98025e
* Bump versionJani Heikkinen2021-02-181-1/+1
| | | | Change-Id: If1acb547565a0b0edce76b3a0e78e11538de1771
* Bump versionPaul Wicking2020-12-111-1/+1
| | | | Change-Id: I749a5c634b933d764ba2d540d1819e32d2e8c931
* Remove QT_NO_LINKED_LISTSona Kurazyan2020-02-051-1/+0
| | | | | | | | QLinkedList is deprecated and moved to Qt5Compat, there's no need for QT_NO_LINKED_LIST. Change-Id: I3560edc79cdd28c77ec2a4344b8744ff0597d3dc Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Merge remote-tracking branch 'origin/dev' into wip/qt6Simon Hausmann2019-09-161-0/+1
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ifb5723b11bf5fe5bb3583018f496beba17c6bf40
| * Bump versionKari Oikarinen2019-08-271-1/+1
| | | | | | | | Change-Id: I2fb2146b4262753c1397083e7f182650d6f593f7
| * QWaylandShmBackingStore: replace a QLinkedList with std::listMarc Mutz2019-07-121-0/+1
| | | | | | | | | | | | | | | | | | | | ...and mark the module QLinkedList-free. QLinkedList is going to be deprecated. Change-Id: Ieb9efef24cd8677edc1262f22b7c6d41b6376347 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Johan Helsing <johan.helsing@qt.io>
* | Bump module version to 6.0.0Simon Hausmann2019-07-111-1/+1
|/ | | | | | | And fix the build at the same time. Change-Id: I71f1ef2b8777fe514107a27c9ef6ee4c702a74c0 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Mark the module as free from Java-style-iterators, so it stays that wayMarc Mutz2019-05-231-0/+1
| | | | | | Change-Id: Ic8a10575a30f32a8eed6982d636feb4be2f6917e Reviewed-by: Johan Helsing <johan.helsing@qt.io>
* Mark the module Q_FOREACH-free, so it stays that wayMarc Mutz2019-05-171-0/+2
| | | | | | Change-Id: I2b593069a6da8cc5f4c7057f48c3e5fa42c27b9c Reviewed-by: Johan Helsing <johan.helsing@qt.io>
* Bump versionKari Oikarinen2019-02-251-1/+1
| | | | Change-Id: I9d5a607f8d222c17fb64f3d5f4f434f9145894f6
* Bump versionOswald Buddenhagen2018-10-111-1/+1
| | | | Change-Id: Ia876bca69122a39791aee5a6ab36a843d6168feb
* Bump versionOswald Buddenhagen2018-02-191-1/+1
| | | | Change-Id: I8d8028ba4a311cd154c8c9f05dfc24c741053011
* Bump versionFrederik Gladhorn2017-09-041-1/+1
| | | | Change-Id: I854f6b0a72c17df2b5b6cb819eb8b6644cf9a264
* Bump versionOswald Buddenhagen2017-02-021-1/+1
| | | | Change-Id: I8842d4cbcb1e6de40c94283e3b730989c31ee1da
* Bump versionOswald Buddenhagen2016-08-291-1/+1
| | | | Change-Id: I64908d1dde501c5dc9d4295d3a7eb98098c826e9
* Bump versionOswald Buddenhagen2016-02-231-1/+1
| | | | Change-Id: Idac4ebfad9020f9d1e287f2e95b6792e11158e7d
* Bump versionOswald Buddenhagen2015-09-101-1/+1
| | | | Change-Id: I3194342a721cba9b71205ece7d1c7b6e09fbebeb
* Bump versionOswald Buddenhagen2015-02-241-1/+1
| | | | Change-Id: I1e6fa03cf425b92bf777adb337937dceaf6c9faa
* Bump versionOswald Buddenhagen2014-08-111-1/+1
| | | | Change-Id: I6563bb51fcb021ebe86d330a64aea7d79bf36ba5
* Bump versionOswald Buddenhagen2014-08-111-1/+1
| | | | Change-Id: Ice3cf6329f2dea88b58e7a6b61223394e98dcfb1
* Bump version to 5.3Pier Luigi Fiorini2013-11-151-1/+1
| | | | | | | Follow Qt version in the dev branch which is now 5.3. Change-Id: Ib10a39cf8cc43dbbc7113d2ca06a9404d7b23a1e Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
* Update to work with Qt 5.2Andy Nichols2013-09-101-1/+1
| | | | | | | Change-Id: Ide081251b32ade32d552fc949e10a518ff0fa89a Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com> Reviewed-by: Jan Arne Petersen <jan.petersen@kdab.com>
* define MODULE_VERSIONOswald Buddenhagen2013-02-281-0/+2
| | | | | | | | Task-number: QTBUG-29838 Change-Id: I9ec74d81e8deab722bba2426172002d7b470b613 Reviewed-by: Andy Nichols <andy.nichols@digia.com> Reviewed-by: Jørgen Lind <jorgen.lind@gmail.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* centralize load(qt_build_config)s in .qmake.confOswald Buddenhagen2012-09-111-0/+1
Change-Id: I229c0704fc3a5d230c921b8f9a08ad1b8ee124f6 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
View Lorry Controller Status