summaryrefslogtreecommitdiffstats
path: root/.qmake.conf
Commit message (Collapse)AuthorAgeFilesLines
* Remove .qmake.conf from this repositoryJoerg Bornemann2021-09-211-5/+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: I962652ead17154fb2dd62b287e1e725f8275832c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Bump versionJani Heikkinen2021-09-141-1/+1
| | | | Change-Id: I904c0ca92481cbf7576b58842947e6f3b1df9e2a
* Bump versionJani Heikkinen2021-02-221-1/+1
| | | | Change-Id: Id2d25a5c7dd665a051c25e13c500ab749f7c5f6c
* Bump versionPaul Wicking2020-12-111-1/+1
| | | | Change-Id: Id85a335acd0ac0432149f0415b453ecb06fa848f
* Remove QT_NO_LINKED_LISTSona Kurazyan2020-02-051-1/+1
| | | | | | | | QLinkedList is deprecated and moved to Qt5Compat, there's no need for QT_NO_LINKED_LIST. Change-Id: Id639a83fbe30108d01244f9bc9888578751aff6e Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Merge remote-tracking branch 'origin/wip/qt6' into devSimon Hausmann2019-10-041-1/+1
|\ | | | | | | | | | | | | | | Conflicts: .qmake.conf src/windeployqt/main.cpp Change-Id: I446b51332eaaec91f502fcc2ceca52291b0b0468
| * Fix Qt6 buildAlexandru Croitor2019-08-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Fixes some unprefied textstream usages. Bump the module version to 6.0.0. Also windeployqt auto test is temporarily blacklisted because with the current situation it's not possible to make it pass both with a 5.x and a 6.x Qt build, and thus this would prevent a qt5.git integration. Change-Id: If750cf4f50ba4215cb63b53c42971f3d1f1c8160 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Bump versionKari Oikarinen2019-08-271-1/+1
| | | | | | | | Change-Id: I4714b2d47929e87cb5adaedc26b28a4430b17240
* | Eradicate the last Java-style iterators and mark the module free of themMarc Mutz2019-07-121-0/+2
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and of QLinkedList. The change in QDesignerAbstractPropertySheetFactory is straight-forward. The rest are little buggers: - In macdeployqt, the code iterates inside an if. Weird, but portable. - In CppCodeParser, it's still somewhat harmless: just a call to std::remove_if to avoid running into quadratic complexity, even though the original loop had a good idea of iterating backwards, saving at least some copies in the process. Need to take care there that we continue to find the _first_ main.cpp, not the last, so add a check for mainCpp.isEmpty(). - In QtGradientStopsModel, however, needed to work around the absence of QMap::rbegin()/rend(), and it shows why they're missing: QMap's funky op* makes it impossible to just use std::reverse_iterator to do the heavy lifting. Use the recently-added QKeyValueIterator to get an approximation. I say 'approximation', because that one lacks operator->, so we need to use (*it).first, which brings back memories of Qt 2's iterators... Change-Id: I051e64b8d36b04ed2e7cf7695d9b797f08efaccb Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Bump versionKari Oikarinen2019-02-251-1/+1
| | | | Change-Id: I2102fa85cfa26eced49456e8ef03e7e2cb47cd72
* Bump versionOswald Buddenhagen2018-10-111-1/+1
| | | | Change-Id: Iede1943b4e7b6eb0292212774fe31ff715d90562
* Bump versionOswald Buddenhagen2018-02-191-1/+1
| | | | Change-Id: Iae0812524721d68e8d6dc3135d2219b185903c6e
* Bump versionFrederik Gladhorn2017-09-041-1/+1
| | | | Change-Id: I402b6dd923139e90867663e7c50c4bb429de07e7
* Bump versionOswald Buddenhagen2017-02-021-1/+1
| | | | Change-Id: I4164858a66b90a20d7dcafe2d449d61603a0539b
* Bump versionOswald Buddenhagen2016-08-291-1/+1
| | | | Change-Id: I887b4caee7a43133bb9659167b992bcb33c09155
* Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-06-301-1/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/assistant/qcollectiongenerator/main.cpp src/qtestlib/wince/cetcpsync/main.cpp src/qtestlib/wince/cetcpsync/qtcesterconnection.cpp src/qtestlib/wince/cetcpsync/qtcesterconnection.h src/qtestlib/wince/cetcpsync/remoteconnection.cpp src/qtestlib/wince/cetcpsync/remoteconnection.h src/qtestlib/wince/cetcpsyncserver/commands.cpp src/qtestlib/wince/cetcpsyncserver/commands.h src/qtestlib/wince/cetcpsyncserver/connectionmanager.cpp src/qtestlib/wince/cetcpsyncserver/connectionmanager.h src/qtestlib/wince/cetcpsyncserver/main.cpp src/qtestlib/wince/cetcpsyncserver/transfer_global.h src/qtestlib/wince/cetest/activesyncconnection.cpp src/qtestlib/wince/cetest/activesyncconnection.h src/qtestlib/wince/cetest/cetcpsyncconnection.cpp src/qtestlib/wince/cetest/cetcpsyncconnection.h src/qtestlib/wince/cetest/deployment.cpp src/qtestlib/wince/cetest/deployment.h src/qtestlib/wince/cetest/main.cpp src/qtestlib/wince/cetest/remoteconnection.cpp src/qtestlib/wince/cetest/remoteconnection.h src/qtestlib/wince/remotelib/commands.cpp src/qtestlib/wince/remotelib/commands.h Change-Id: Ia1b311710f7e8009ca1697faae3ae5e37e80ecc3
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-291-1/+0
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/assistant/assistant/doc/src/assistant-manual.qdoc Change-Id: I136caf5f26eff4d1c2574459b8dff9937c2c372d
| | * do not enable example installs explicitly any moreOswald Buddenhagen2016-05-241-1/+0
| | | | | | | | | | | | | | | | | | | | | it's done centrally now. Change-Id: I8d1dd4dc61ddecd40954b64cfb549451aff01391 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| | * Bump versionOswald Buddenhagen2016-05-191-1/+1
| | | | | | | | | | | | Change-Id: I1fdb13693f8879768e09edc6c84c599edf10b6d4
| | * Bump versionOswald Buddenhagen2016-02-081-1/+1
| | | | | | | | | | | | Change-Id: I526302ea8936171a730dd942461b338037125de9
* | | Bump versionOswald Buddenhagen2016-02-231-1/+1
|/ / | | | | | | Change-Id: I41176d7c26971bfe75948bbf30727481f9ee731e
* / Bump versionOswald Buddenhagen2015-09-101-1/+1
|/ | | | Change-Id: I1345faaffade7162f9225321c375256cf547ece2
* Bump versionOswald Buddenhagen2015-02-241-1/+1
| | | | Change-Id: Ide874606e7bb380cf885b845592de81611504f5a
* Bump versionOswald Buddenhagen2014-08-091-1/+1
| | | | Change-Id: Ib6e9218629734ee0f2874a8ed5a89131d23c19f2
* Bump module version to 5.4.0Thiago Macieira2014-02-201-1/+1
| | | | | | Change-Id: Ia57a1291ab4a8c76ad345dcad0b091ff8a9dbb96 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Bump qttools version to 5.3.0Thiago Macieira2013-10-141-1/+1
| | | | | Change-Id: I87c11488b95c72f261a75034cf70f92705d86100 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Update module version to 5.2.0Frederik Gladhorn2013-03-281-1/+1
| | | | | Change-Id: I310777c1005de28da1eb6326fec03ebb7716919a 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: I1f48216fd27e40d70ffd020ed1b880b03df0bf12 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* define MODULE_VERSIONOswald Buddenhagen2013-02-281-0/+2
| | | | | | Task-number: QTBUG-29838 Change-Id: If7a85b5bf9701b1f804091b645b7de6554d4a27d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* leverage qt_example_installs.prfJoerg Bornemann2012-12-051-0/+1
| | | | | | Change-Id: Ie6b02fd48aaa6b303629bb8e66cfe567aa8ca7df Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* centralize load(qt_build_config)s in .qmake.confOswald Buddenhagen2012-09-201-0/+1
Change-Id: Ifbef0323f3a3fc80b10ac2c8c8a8a68ce646c1e6 Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-25 15:08:20 +0000