diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-12-25 18:28:32 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-12-25 18:35:38 +0100 |
| commit | 9a272ad1854d744ea57296ba633b9d0dc19d1625 (patch) | |
| tree | 096752ec339e18998517a4598f907e4b42b9403d /examples/quick/localstorage/localstorage | |
| parent | 70c6b9639c53d2a530ccabd1395f561211c16fa4 (diff) | |
| parent | d8a052bc6b0349045db3d43a373b09cb16b41a48 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
tools/qmlimportscanner/main.cpp
Change-Id: I01e17581f6691a03f83788773364d0cf96319514
Diffstat (limited to 'examples/quick/localstorage/localstorage')
| -rw-r--r-- | examples/quick/localstorage/localstorage/qml-localstorage-example.png | bin | 46168 -> 0 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/examples/quick/localstorage/localstorage/qml-localstorage-example.png b/examples/quick/localstorage/localstorage/qml-localstorage-example.png Binary files differdeleted file mode 100644 index 7d7edafe63..0000000000 --- a/examples/quick/localstorage/localstorage/qml-localstorage-example.png +++ /dev/null |
