diff options
| author | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2014-10-29 09:45:41 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2014-10-29 09:45:41 +0200 |
| commit | e3a4f132ca2a42af3d4bb889d6a17948b88d26a2 (patch) | |
| tree | 554d2b8b3020dc71438301aa696dea1e9a36943a /qtdatavisualization.pro | |
| parent | cc50608385cf77a0803431ece1385f341a400b75 (diff) | |
| parent | bf716cfdf0afecccdb1f2eabb2e6a172c620fbff (diff) | |
Merge branch 'develop'
Conflicts:
.qmake.conf
README
src/datavisualization/global/qdatavisualizationglobal.h
Change-Id: Ia6941dcf3e6aa17e2e9ebc6f60fac16ef5049f11
Diffstat (limited to 'qtdatavisualization.pro')
| -rw-r--r-- | qtdatavisualization.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qtdatavisualization.pro b/qtdatavisualization.pro index bb98435e..faadadbc 100644 --- a/qtdatavisualization.pro +++ b/qtdatavisualization.pro @@ -8,4 +8,4 @@ contains(QT_CONFIG, opengles1) { error(QtDataVisualization does not support OpenGL ES 1!) } -OTHER_FILES += README dist/* +OTHER_FILES += README dist/* .qmake.conf |