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/qmloscilloscope/qmloscilloscope.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/qmloscilloscope/qmloscilloscope.pro')
| -rw-r--r-- | examples/charts/qmloscilloscope/qmloscilloscope.pro | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/examples/charts/qmloscilloscope/qmloscilloscope.pro b/examples/charts/qmloscilloscope/qmloscilloscope.pro index a66fabcd..34ef74db 100644 --- a/examples/charts/qmloscilloscope/qmloscilloscope.pro +++ b/examples/charts/qmloscilloscope/qmloscilloscope.pro @@ -1,11 +1,17 @@ -!include( ../examples.pri ) { - error( "Couldn't find the examples.pri file!" ) -} - -RESOURCES += resources.qrc -SOURCES += main.cpp \ - datasource.cpp -OTHER_FILES += qml/qmloscilloscope/* +QT += charts qml quick HEADERS += \ datasource.h + +SOURCES += \ + main.cpp \ + datasource.cpp + +RESOURCES += \ + resources.qrc + +DISTFILES += \ + qml/qmloscilloscope/* + +target.path = $$[QT_INSTALL_EXAMPLES]/charts/qmloscilloscope +INSTALLS += target |