diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-10 17:48:55 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-11 09:00:45 +0200 |
| commit | a7b80c0b6176692ee2b7abdce7acdc5c37a72d00 (patch) | |
| tree | 6d4835511c823e1ebff312869e51c9ff949f85ad /examples/charts/qmloscilloscope/qmloscilloscope.pro | |
| parent | c121fb4ad00bc9617a011e040ef5ed695610a504 (diff) | |
| parent | 64d931d5fc5f17b8c4875f6c59f900aa59080881 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/charts/glwidget.cpp
src/charts/xychart/glxyseriesdata_p.h
src/chartsqml2/declarativerendernode.cpp
Change-Id: I611ff3a7874ceb7dddcf0f4d069927a9899a986d
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 |