summaryrefslogtreecommitdiffstats
path: root/.qmake.conf
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.7' into devOswald Buddenhagen2016-07-011-1/+2
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I39ab590ec2c95b3c213e90dad5a8f5e3e626baab
| * Bump versionOswald Buddenhagen2016-07-011-1/+1
| | | | | | | | Change-Id: I63c26a17001259dda17256291fc181ddccb5ca50
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-291-1/+2
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Iba1819a7e10957f4bb5be90852747a4b459a3172
| | * Bump versionOswald Buddenhagen2016-05-191-1/+1
| | | | | | | | | | | | Change-Id: I7c2473f07d7d1b65f39cf51df2817d4a74296462
| | * do not enable example installs explicitly any moreOswald Buddenhagen2016-04-281-1/+0
| | | | | | | | | | | | | | | | | | | | | it's done centrally now. Change-Id: I5354ed1d92ffb988a0771783f94ee728b9ebeb12 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| | * pretend that the example installs are not FUBAROswald Buddenhagen2016-04-281-0/+2
| | | | | | | | | | | | | | | Change-Id: I1fad2e055f3d10d481a4bb01c014e9ac8c1abf44 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| | * Bump versionOswald Buddenhagen2016-02-081-1/+1
| | | | | | | | | | | | Change-Id: I7831244b4ebc31d9adb135ce6453c09a185b076c
* | | Bump versionOswald Buddenhagen2016-02-231-1/+1
|/ / | | | | | | Change-Id: Iaa2c5ca98c930d434e152f665bb6bcf2eaac2a34
* / Bump versionOswald Buddenhagen2015-09-101-1/+1
|/ | | | Change-Id: Ib2b8d668934542c73dc54b51e29f51e94b33c80c
* Bump versionOswald Buddenhagen2015-02-241-1/+1
| | | | Change-Id: I97bef8bdf910f2f0f29187f39c022a5df06e82cc
* Bump versionOswald Buddenhagen2014-08-091-1/+1
| | | | Change-Id: I45794952049658ec8d6a41a0b9d3da40be6ba549
* Bump module version to 5.4.0Thiago Macieira2014-02-201-1/+1
| | | | | | Change-Id: I49e9b8117f01dfd86f6cdd73509d54575a187f0f Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Bump qtquick1 version to 5.3.0Thiago Macieira2013-10-141-1/+1
| | | | | | Change-Id: I5d94fe1e2fde1ff898afbd9da93f77deeb0a1769 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-03-261-0/+2
|\ | | | | | | Change-Id: I82c73a1924fa659312e4b34df2b038def2d8d959
| * Bump MODULE_VERSION to 5.1.0Sergio Ahumada2013-03-251-1/+1
| | | | | | | | | | Change-Id: I5362a735a0982eedad071a307e1a423eaee57041 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * define MODULE_VERSIONOswald Buddenhagen2013-02-271-0/+2
|/ | | | | | Task-number: QTBUG-29838 Change-Id: I0dd628cdf63c13a8ac94213f2fc1b7d04df24786 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* centralize and fixup example sources install targetsOliver Wolff2012-12-111-0/+1
| | | | | | | | follow respective change in qtbase Change-Id: I15346e16cd1d6f30cf32a77284b5f19b1dd2a7a9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: hjk <qthjk@ovi.com>
* centralize load(qt_build_config)s in .qmake.confOswald Buddenhagen2012-09-111-0/+1
Change-Id: I627dfef54743821d0c3019034f114ac4d81fda76 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-06 13:04:06 +0000