aboutsummaryrefslogtreecommitdiffstats
path: root/.qmake.conf
Commit message (Collapse)AuthorAgeFilesLines
* Remove .qmake.conf from this repositoryJoerg Bornemann2021-09-221-8/+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: I724be53722e9c80640b933be782bfcc5df8ecafd Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Bump versionJani Heikkinen2021-09-141-1/+1
| | | | Change-Id: I3cb64784d9ac63bdfa24b5663a1be3c43d4738f0
* Merge qtquickcontrols2 into qtdeclarativeMitch Curtis2021-07-281-0/+2
|\ | | | | | | | | Task-number: QTBUG-95173 Change-Id: I2cf31e30127e8cc2f10304cabf4ff7f5050633b8
| * Bump versionJani Heikkinen2021-02-181-1/+1
| | | | | | | | Change-Id: Id96b84b8ade70d5be0318520b286fc6a43ccef38
| * Bump versionPaul Wicking2020-12-111-1/+1
| | | | | | | | Change-Id: I29f96add60c80ee999a54918685fb8c3373dca58
| * 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: Ia860de2aea3ced81b661138f5da8afc720a08ccf Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Merge remote-tracking branch 'origin/dev' into wip/qt6Alexandru Croitor2019-08-111-1/+2
| |\ | | | | | | | | | Change-Id: I7c03e9e5227899188d4e16467f692419dc9e9c5b
| | * Mark the module free of Java-stye iterators and QLinkedListMarc Mutz2019-07-111-1/+2
| | | | | | | | | | | | | | | Change-Id: I1e76b546c54b1fe58b4094bcb96a3692c2242d2e Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| * | Bump Qt version to Qt 6Alexandru Croitor2019-07-101-1/+1
| |/ | | | | | | | | | | Change-Id: Ib986d78e5815033c33e6be9da17f9d66e86f9fd1 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Bump versionKari Oikarinen2019-02-251-1/+1
| | | | | | | | Change-Id: I3bb8163c686ce3112677ca99b34f8db46b5a2d39
| * Bump versionOswald Buddenhagen2018-10-111-1/+1
| | | | | | | | Change-Id: Id4bc3cc1997a8c9b80988adbf4372e7641ab09f0
| * Bump versionOswald Buddenhagen2018-02-191-1/+1
| | | | | | | | Change-Id: I5708cb4d92c52913864fe128e46aa5307c8673af
| * Bump versionFrederik Gladhorn2017-09-041-1/+1
| | | | | | | | Change-Id: I54773e2f74761b4b3ea9337b30db99ca4a9eb301
| * Bump versionOswald Buddenhagen2017-02-021-1/+1
| | | | | | | | Change-Id: I6ce23292532fc0747ff7536359052fc262566a5a
| * Merge remote-tracking branch 'origin/5.8' into devJ-P Nurmi2016-09-061-0/+1
| |\ | | | | | | | | | Change-Id: If097242bfffe435d3b379a73eb6c8f54bed8495b
| | * Merge remote-tracking branch 'origin/5.7' into 5.8J-P Nurmi2016-09-061-0/+1
| | |\ | | | | | | | | | | | | Change-Id: Ief98cd56abd13cfa4e30578e150207462a8243b8
| | | * Replace 'foreach' with 'range for'Anton Kudryavtsev2016-09-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And add QT_NO_FOREACH define to .qmake.conf. Now QuickControls2 is 'foreach' free. Change-Id: I98695258859decadae6fd2f23f5f6f5ef2b0550f Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| | | * Bump versionOswald Buddenhagen2016-07-281-1/+1
| | | | | | | | | | | | | | | | Change-Id: Ib1d6e64978a6a60a9bad99c4b46cc434efee9c19
| * | | Bump versionOswald Buddenhagen2016-08-291-1/+1
| |/ / | | | | | | | | | Change-Id: I7ada05e722384bf5ce506c66315a414cf45b6d08
| * / Bump versionOswald Buddenhagen2016-02-231-1/+1
| |/ | | | | | | Change-Id: I91173dfde8b0654263784cf05698b2568bfe7f8a
| * Update MODULE_VERSION in .qmake.confJ-P Nurmi2016-01-271-1/+1
| | | | | | | | | | | | Change-Id: Icc727316acde38485f8f07543a79bc367a03b18b Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * .qmake.conf: set QQC2_SOURCE_TREEJ-P Nurmi2015-10-241-0/+2
| | | | | | | | | | | | | | A tad nicer way to pass the correct path for tests. Change-Id: I0415d64737bbaa6de163e855080ed3a147f547d5 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| * Import the Qt Quick Controls 2 prototypeJ-P Nurmi2015-02-051-0/+4
| | | | | Change-Id: Ib8c0c4160958e5cfea29a6e9df1b3f1fb19715fc Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
* Bump versionJani Heikkinen2021-02-221-1/+1
| | | | Change-Id: I89031620e380fd57e69eaf13b970849b97ffe42b
* Bump versionPaul Wicking2020-12-111-1/+1
| | | | Change-Id: Ieef395da0c38f0794a4443c01a5342a27b8b7d16
* Remove QT_NO_LINKED_LISTSona Kurazyan2020-02-121-1/+0
| | | | | | | | QLinkedList is deprecated and moved to Qt5Compat, there's no need for QT_NO_LINKED_LIST. Change-Id: I48acd7d1dc88e6b94f396f7146edc75d334a03bd Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Bump qtdeclarative version to 6.0.0Alexandru Croitor2019-07-091-1/+1
| | | | | | Change-Id: I6bf9b4d99eae600d05ff8c80f71d4bd02b27d54f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Eradicate Java-style iterators and mark the module free of themMarc Mutz2019-07-041-0/+1
| | | | | | | | Java-style iterators are scheduled to be deprecated, or at the very least banned from use in Qt's own implementation. Change-Id: I6a1aeceb22dfa13c4ed7443296455b60abed7d67 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Mark the module QLinkedList-free, so it stays that wayMarc Mutz2019-07-011-0/+2
| | | | | Change-Id: I185ee04460736d496179281d57748f2d80f13740 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Bump versionKari Oikarinen2019-02-251-1/+1
| | | | Change-Id: I945e3f606c2dc1c72e9f8c38952274f90d60161e
* Bump versionOswald Buddenhagen2018-10-111-1/+1
| | | | Change-Id: I2d13fcbb87961d8c52190ef978f1fdc3c36acc12
* Bump versionOswald Buddenhagen2018-02-191-1/+1
| | | | Change-Id: I378de287933060ad84911286ca269675057eda8b
* Bump versionFrederik Gladhorn2017-09-041-1/+1
| | | | Change-Id: I8d5439ceeca957201f7074cb2d4ca9cc0fbdcd7b
* Bump versionOswald Buddenhagen2017-02-021-1/+1
| | | | Change-Id: I1ffbb56e768a3e5be72d0f51937400ea0e38aa44
* Bump versionOswald Buddenhagen2016-08-291-1/+1
| | | | Change-Id: I0bcdd0ff6c85af8a579f962343149b2ada9cba8a
* Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-06-131-1/+0
|\ | | | | | | | | | | | | Conflicts: src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp Change-Id: I26d6435a29cac3840bb567ade5149c2562a94bf9
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-101-1/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of 0e053528 was reverted in the merge, about lastTimestamp. It will be applied later in separate commit. qmltest::shadersource-dynamic-sourceobject::test_endresult() was blacklisted on linux. Conflicts: .qmake.conf tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp tests/auto/qmltest/BLACKLIST tests/auto/qmltest/qmltest.pro Task-number: QTBUG-53590 Task-number: QTBUG-53971 Change-Id: I48af90b49a3c7b29de16f4178a04807f8bc05130
| | * do not enable example installs explicitly any moreOswald Buddenhagen2016-05-241-1/+0
| | | | | | | | | | | | | | | | | | | | | it's done centrally now. Change-Id: I4c0641f988da7c6bd0522453a2c7e10c8d640f02 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * Bump versionOswald Buddenhagen2016-05-191-1/+1
| | | | | | | | | | | | Change-Id: Id97d3672ea1bd153df57f8986994accd70ae798f
| | * Bump versionOswald Buddenhagen2016-02-081-1/+1
| | | | | | | | | | | | Change-Id: Ife0809638e3af50304c37931cae3c5d16906b936
* | | Bump versionOswald Buddenhagen2016-02-241-1/+1
|/ / | | | | | | Change-Id: Iddb9c8504c2d985dd13c471bd4a375e08c03c99e
* / Bump versionOswald Buddenhagen2015-09-101-1/+1
|/ | | | Change-Id: I4c5599953e0b12f7955513d38ccbf211889c54ab
* Bump versionOswald Buddenhagen2015-02-241-1/+1
| | | | Change-Id: I5b5e234edb901e7f38cdd21ac1148867b6f307f9
* Bump versionOswald Buddenhagen2014-08-091-1/+1
| | | | Change-Id: I439d6cbb0d5f67aad72ea3a5ed7a2c3db5119c2c
* Bump module version to 5.4.0Thiago Macieira2014-02-281-1/+1
| | | | | | Change-Id: Iba0502c83eb32f24691a4c0645ba1434033bfbc4 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Merge branch 'stable' into devSergio Ahumada2013-11-271-18/+0
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I10d4f9e993d23750a6e8ddc1291b79e47fc83c64
| * Bump MODULE_VERSION to 5.2.1Sergio Ahumada2013-11-201-1/+1
| | | | | | | | | | Change-Id: I211610ee4153fa1e24de085d64bd735ce3746ae0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Remove the last C++ exceptions from QtQmlLars Knoll2013-10-301-17/+0
| | | | | | | | | | | | | | | | Also clean up and compile the repository with exceptions disabled again. Change-Id: I653ae89353284b2f4ab884384f8ea6a5d100785d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | Bump qtdeclarative version to 5.3.0Thiago Macieira2013-09-241-1/+1
|/ | | | | Change-Id: I3eee67a18f24ac5b68e7cc9dc1ba256746dbbb9e Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Enable -Werror for qtdeclarativeAlan Alpert2013-09-111-0/+1
| | | | | | | | | | | | This allows CI to screen for warnings in src and tools code. It does not apply to examples or tests. This is the same as commit 7012db159bc4196444ace26991b24a31e3fba495 in qtbase. Change-Id: I0ea00fbd4b45156dedabfd16a3cb3e5f6170f23f Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-30 23:17:47 +0000