diff options
author | Liang Qi <liang.qi@qt.io> | 2018-02-12 13:26:55 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-02-12 16:31:13 +0100 |
commit | 4d525de33e2ee55e69bb6c90fc11049a0f8b36b5 (patch) | |
tree | c9808baeabb1121f488a7b59ffff314cc62d80e8 /examples/quick/demos/stocqt/doc/src/stocqt.qdoc | |
parent | 47cd9da96371ccd495f6caabe1c6853258210ebb (diff) | |
parent | 3e3c6717ba634825a65069541500c40645a808ee (diff) |
Merge remote-tracking branch 'origin/5.10' into 5.11
Conflicts:
src/imports/shapes/qquickshape.cpp
src/imports/shapes/qquickshape_p_p.h
src/qml/compiler/qqmlpropertycachecreator_p.h
src/qml/jsruntime/qv4value_p.h
src/quick/items/qquickloader_p.h
tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
tools/qmlprofiler/qmlprofilerapplication.cpp
Change-Id: Iafc66ae84bf78630ed72a986acb678e9d19e3a69
Diffstat (limited to 'examples/quick/demos/stocqt/doc/src/stocqt.qdoc')
-rw-r--r-- | examples/quick/demos/stocqt/doc/src/stocqt.qdoc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/examples/quick/demos/stocqt/doc/src/stocqt.qdoc b/examples/quick/demos/stocqt/doc/src/stocqt.qdoc index c2fa4062cb..e324cf63b5 100644 --- a/examples/quick/demos/stocqt/doc/src/stocqt.qdoc +++ b/examples/quick/demos/stocqt/doc/src/stocqt.qdoc @@ -30,19 +30,18 @@ \ingroup qtquickdemos \example demos/stocqt \brief A configurable stock chart for the NASDAQ-100. - \image qtquick-demo-stocqt.png + \borderedimage qtquick-demo-stocqt.png The \e{StocQt} application presents a trend chart for the first stock in - the list of NASDAQ-100 stocks maintained by it. It allows the user to - choose another stock from the list, and fetches the required data for - the selected stock by sending an \c XMLHttpRequest to - http://finance.yahoo.com. + the list of NASDAQ-100 stocks. It allows the user to choose another stock + from the list, and fetches the required data from the offline dataset + using \c XMLHttpRequest. The application uses several custom types such as Button, CheckBox, StockChart, StockInfo, StockView, and so on. These types are used to present the stock data in a readable form and also let the user customize - the trend chart. For example, the user can choose to view the yearly, - monthly, or daily trends in the stock price. + the trend chart. For example, the user can choose to view the weekly, + monthly, quarterly, or half yearly trends in the stock price. The application uses the ObjectModel type to access the two visual data models that it depends on. |