summaryrefslogtreecommitdiffstats
path: root/.qmake.conf
Commit message (Collapse)AuthorAgeFilesLines
* Bump module version to 5.4.0Thiago Macieira2014-02-201-1/+1
| | | | | | Change-Id: Ie3f13dde04f6a8128a27f8d7996fce0ae46979a2 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-11-291-0/+1
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I41358c93240ae922f8493f6d55a5bffcfb06bc79
| * Fix make install rules to all examples in QtConnectivity repoAlex Blasche2013-11-281-0/+1
| | | | | | | | | | | | | | | | | | This was highlighted during the testing of the Qt 5.2.0 package. Change-Id: I94b27f02a6621bccb9f0ce0d0cc184a449014573 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * Bump MODULE_VERSION to 5.2.1Sergio Ahumada2013-11-251-1/+1
| | | | | | | | | | | | Change-Id: Id446a3388daf82e02d3d052af1ec59b0e0db44c0 Reviewed-by: Matti Paaso <matti.paaso@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Bump qtconnectivity version to 5.3.0Thiago Macieira2013-09-251-1/+1
|/ | | | | Change-Id: I792f202dc73fe66a224711a55a9725014c7dc858 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Set proper API version for NFC and Bluetooth API.Alex Blasche2013-06-201-1/+1
| | | | | | | In addition we update gitignore to suppress example binaries. Change-Id: I3d5755d7ae9f45d5d51858a16edc9c8dbead974e Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* define MODULE_VERSIONOswald Buddenhagen2013-03-051-0/+2
| | | | | | Task-number: QTBUG-29838 Change-Id: I747e601f4d3f3603f3a20f4641f1ca828d1da109 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* centralize load(qt_build_config)s in .qmake.confOswald Buddenhagen2012-09-111-0/+1
Change-Id: I7f6eeb8a129775c1b6616531e6ed05cb0e0b7bd3 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>