summaryrefslogtreecommitdiffstats
path: root/.qmake.conf
Commit message (Collapse)AuthorAgeFilesLines
* Bump versionFrederik Gladhorn2019-05-231-1/+1
| | | | Change-Id: I431c0fe718d173a6c45ade6b17b461586a5f0ca7
* Bump versionKari Oikarinen2019-03-211-1/+1
| | | | Change-Id: I839259639ef0598cdace77b29ec484b0f6f388a2
* Bump versionKari Oikarinen2019-01-141-1/+1
| | | | Change-Id: I43b093bc44ff6fd1c83b26fe60f5d7c443334ea4
* Bump versionKari Oikarinen2019-01-071-1/+1
| | | | Change-Id: I8ddc0630f221e7f2bcf1b7df52f2aeac3ab76e3a
* 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-17 18:13:44 +0000