summaryrefslogtreecommitdiffstats
path: root/.qmake.conf
Commit message (Collapse)AuthorAgeFilesLines
* Bump versionOswald Buddenhagen2017-02-021-1/+1
| | | | Change-Id: I6460a678c5083d42e5ebaa23cc78cb84bd2b9348
* Bump versionOswald Buddenhagen2016-08-291-1/+1
| | | | Change-Id: Ibdbe8a9889e901724bd04840119690ed9bfecdb7
* Merge remote-tracking branch 'origin/5.7' into devEdward Welbourne2016-07-281-1/+0
|\ | | | | | | | | | | | | | | Conflicts: src/charts/common.pri One side added to a file the other removed, claiming it is redundant. Change-Id: I57e2901ec14dd9c02c409cf5714a2f553932fb30
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-291-1/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/charts/charts.pro src/charts/qchartglobal.h src/chartsqml2/chartsqml2.pro tests/auto/chartdataset/tst_chartdataset.cpp tests/auto/domain/tst_domain.cpp Change-Id: I9bfc63f6e93f9a3b86e53aca218dd3a48bb2ffc1
| | * do not enable example installs explicitly any moreOswald Buddenhagen2016-05-241-1/+0
| | | | | | | | | | | | | | | | | | | | | it's done centrally now. Change-Id: I8e025df73f1bd1e5e5129cfb4cbcb40b044374bd Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| | * Bump version to 2.1.1Miikka Heikkinen2016-04-051-1/+1
| | | | | | | | | | | | | | | | | | Change-Id: If426ff4b1278b28afc7406fb42a7a6ad34aa725a Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* | | Bump versionOswald Buddenhagen2016-02-231-1/+1
|/ / | | | | | | Change-Id: I3788b6a5ae9d57ec1b2bfde5b18966f69e03ba31
* / Fix version numbersMiikka Heikkinen2016-01-151-1/+1
|/ | | | | | | | | QML API version was only updated to what it actually is, it doesn't need to follow the module version. Change-Id: I5c26da72b03a1e6858327a8a08f933998991c39e Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Added dist file for 2.1.0 and changed version numbersTitta Heikkala2015-09-111-1/+1
| | | | | | | Added placeholder dist file for 2.1.0. Updated version numbers to 2.1.0. Change-Id: Ia2fc30c38c2467d613158b7af4392aa5298d2171 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Qt Charts project file structure changeTitta Heikkala2014-10-141-0/+4
Charts repository structure is changed to follow the structure of a Qt Add-On module. The task includes following changes: - All macros and definitions named 'commercial' have been renamed. - Compile errors related to QString and qSort usage have been fixed. - Old demos are moved under examples. The QML examples now support only Qt Quick 2.0, the support for Qt Quick 1 is removed. - The QML examples with multiple views are updated so that they are usable also with touch devices. - Unnecessary version checks are removed from examples. - The build stamp has been removed as it was only meant for Charts development purposes and it's no longer needed. Also development build related debug prints are removed as __DATE__ can't be used for all OS thus it doesn't make much sense. - Documentation structure has been updated based on the new module structure. The raw HTML files have been removed. Demos are combined to examples. - Unnecessary .qdocinc files are no longer needed. The content is moved to the corresponding .cpp files. - The Charts widget designer plugin is updated according to the module change. - The test cases updated according to the project structure change. Tests are added also for version 2.0. - cmake modules generation is not needed with Qt 5.4 and Qt Charts so it's disabled. - The new module name and version are updated to the plugin.qmltypes file. Task-number: QTRD-2844, QTRD-3217, QTRD-3218, QTRD-3277, QTRD-3228, QTRD-2526, QTRD-3233, QTRD-3222 Change-Id: Ib7fb26057cde710ffaf6bc780c8bf52a16f45160 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>