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/qmlboxplot | |
| 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/qmlboxplot')
| -rw-r--r-- | examples/charts/qmlboxplot/qmlboxplot.pro | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/examples/charts/qmlboxplot/qmlboxplot.pro b/examples/charts/qmlboxplot/qmlboxplot.pro index 237f05f1..3afed6af 100644 --- a/examples/charts/qmlboxplot/qmlboxplot.pro +++ b/examples/charts/qmlboxplot/qmlboxplot.pro @@ -1,9 +1,13 @@ -!include( ../examples.pri ) { - error( "Couldn't find the examples.pri file!" ) -} +QT += charts qml quick -RESOURCES += resources.qrc -SOURCES += main.cpp +SOURCES += \ + main.cpp -OTHER_FILES += \ - qml/qmlboxplot/main.qml +RESOURCES += \ + resources.qrc + +DISTFILES += \ + qml/qmlboxplot/* + +target.path = $$[QT_INSTALL_EXAMPLES]/charts/qmlboxplot +INSTALLS += target |