summaryrefslogtreecommitdiff
path: root/.qmake.conf
Commit message (Collapse)AuthorAgeFilesLines
* Bump versionOswald Buddenhagen2018-10-111-1/+1
| | | | Change-Id: If157ac85d9d68c005e64a64ce205da65908be405
* Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-04-071-1/+1
|\ | | | | | | Change-Id: I8272137b2bacbb2c446c3b426d864e946261e4fb
| * Do not treat winrt as touch based mobile platformv5.11.0-beta4Oliver Wolff2018-04-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While winrt used to be a touch based, mobile platform before, focus has shifted. Widgets were supported from the start and while they are not the main area of focus, disallowing widget dialogs is not the right approach here. Furthermore the current logic of whether widget dialogs should be registered does not work on winrt. The parts containing widgets either have to be removed completely or bound to the same specific conditions everywhere. The mix of setting "no_desktop" and not having widget dialogs unconditionally for "mobile platforms", but then doing additional checks when registering widget dialog types breaks the concept at least for winrt. Task-number: QTBUG-67144 Change-Id: I36fc5b6f8729bbd128faf1de95fc0bba297ab0e9 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* | Bump versionOswald Buddenhagen2018-02-191-1/+1
|/ | | | Change-Id: Ie9337fd4e4dfd89e6f7bf87da868066dd541156b
* Bump versionFrederik Gladhorn2017-09-041-1/+1
| | | | Change-Id: Ibf13796f5fbcaa443a7b4bfecffd69a565aeb54d
* Bump versionOswald Buddenhagen2017-02-021-1/+1
| | | | Change-Id: Ia9a28a0be682de7072b71e18b16b5d1bf417232d
* Bump versionOswald Buddenhagen2016-08-291-1/+1
| | | | Change-Id: I5d4d99e3ad27c8ff9d9d69f6edd8ea4be4af29fa
* Bump versionOswald Buddenhagen2016-02-231-1/+1
| | | | Change-Id: Id7f4cb33ec1edbfa8693413c44618656bc2604f9
* Bump versionOswald Buddenhagen2015-09-101-1/+1
| | | | Change-Id: Ib669cebbc8978c8ea00c3caf589d88692b4097ce
* Bump versionOswald Buddenhagen2015-02-241-1/+1
| | | | Change-Id: Ia4a6eef94588a8e2c7f8f21d8ca926f7b1bffc94
* Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-10-091-0/+1
|\ | | | | | | Change-Id: Icc27c3f8638601b43daac37ce4a6d9678476996a
| * Declare qtquickcontrols as free of warningsJ-P Nurmi2014-09-301-0/+1
| | | | | | | | | | | | | | -Werror from now on Change-Id: I77b1dab0636bff189f1c03e0e24574e64cf45d1f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Bump versionOswald Buddenhagen2014-08-091-1/+1
|/ | | | Change-Id: Icba34d2ebdcc282372e55fd92da8809ea79b7030
* Merge remote-tracking branch 'origin/5.3' into devJ-P Nurmi2014-07-191-0/+1
|\ | | | | | | Change-Id: Icc15fe685e94dd043979b6b9c6a624f18f2d1e4c
| * Centralize determination of "no desktop" configurationsJ-P Nurmi2014-07-181-0/+1
| | | | | | | | | | | | Change-Id: I030012f48668db4f01737ef92fdb7e6e0426e025 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Liang Qi <liang.qi@digia.com>
| * Bump versionOswald Buddenhagen2014-06-181-1/+1
| | | | | | | | Change-Id: I818c2ac10a2b807cfe67f6964ede4b5d7f7b8d20
| * Bump MODULE_VERSION to 5.3.1Sergio Ahumada2014-04-241-1/+1
| | | | | | | | | | Change-Id: Ic5bad1366373f5c3d8bcb67504e651e5668484f8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Bump module version to 5.4.0Thiago Macieira2014-02-201-1/+1
|/ | | | | | Change-Id: Ib9c41e40478985a6c88ab81d748b2323202a202c Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Bump qtquickcontrols version to 5.3.0Sergio Ahumada2013-09-251-1/+1
| | | | | Change-Id: Id2489a3fd3989a2a3ddb12b3d7564fef9c1da309 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Update module version to 5.2.0Frederik Gladhorn2013-03-281-1/+1
| | | | | Change-Id: Ib6027d669ea56120ea120e97739c0ea2544e9337 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* use qml_plugin.prf in parent-less modeOswald Buddenhagen2013-03-121-0/+2
| | | | | Change-Id: Ifeba27380b874e2ee0f74710e681df3abd93f9a0 Reviewed-by: Liang Qi <liang.qi@digia.com>
* Modularized for Qt 5Liang Qi2012-12-051-0/+1
Still missing sth from qmake, it doesn't support non c++ module correctly yet(there is no CXX_MODULE in our project). Change-Id: I9a6a754e863b51b3e3a4b1eaf864ddab24e92f75 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
View Lorry Controller Status