diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-06 09:22:20 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2016-09-06 11:22:58 +0300 |
| commit | 83d5e7fc85cc07fb180498876d1a346573f747e7 (patch) | |
| tree | c451bf6f083a49fe21244c60b2bb9912c28407cb /examples/charts/scatterinteractions/scatterinteractions.pro | |
| parent | 144474348803564eaa7bb4d17bd609d146e74f9f (diff) | |
| parent | bf26aa9d15e525fdcf6fd3f59268418533f06790 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
examples/charts/charts.pro
src/charts/glwidget.cpp
src/chartsqml2/declarativechart.cpp
src/chartsqml2/declarativeopenglrendernode.cpp
tests/auto/auto.pro
Change-Id: If909b4b13844c474bf4898a66ee01ac111d0a248
Diffstat (limited to 'examples/charts/scatterinteractions/scatterinteractions.pro')
| -rw-r--r-- | examples/charts/scatterinteractions/scatterinteractions.pro | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/examples/charts/scatterinteractions/scatterinteractions.pro b/examples/charts/scatterinteractions/scatterinteractions.pro index 596fe020..e069df7f 100644 --- a/examples/charts/scatterinteractions/scatterinteractions.pro +++ b/examples/charts/scatterinteractions/scatterinteractions.pro @@ -1,9 +1,11 @@ -!include( ../examples.pri ) { - error( "Couldn't find the examples.pri file!" ) -} +QT += charts -TARGET = scatterinteractions -SOURCES += main.cpp \ - chartview.cpp -HEADERS += \ +HEADERS += \ chartview.h + +SOURCES += \ + chartview.cpp \ + main.cpp + +target.path = $$[QT_INSTALL_EXAMPLES]/charts/scatterinteractions +INSTALLS += target |