diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:23:40 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:23:40 +0200 |
| commit | 4b77b044b3e0a27f9f7501e6a78121afc270619c (patch) | |
| tree | e73fbe5865c60494f3b3f847b7385e76d05e3804 /examples | |
| parent | c24118685d6eb4cacf5f6af96215ba89ecc28604 (diff) | |
| parent | a2963fe162921c0abb2116aec6263204954030ad (diff) | |
| download | qtquickcontrols-4b77b044b3e0a27f9f7501e6a78121afc270619c.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1
Change-Id: Ic78345c599719f3dd80b1d6a6004d46a085da4af
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/quick/controls/texteditor/qml/images/qt-logo.png | bin | 3960 -> 3531 bytes | |||
| -rw-r--r-- | examples/quick/controls/texteditor/src/documenthandler.cpp | 1 | ||||
| -rw-r--r-- | examples/quick/extras/dashboard/images/fuel-icon.png | bin | 666 -> 409 bytes | |||
| -rw-r--r-- | examples/quick/extras/gallery/images/center.png | bin | 2392 -> 2260 bytes |
4 files changed, 0 insertions, 1 deletions
diff --git a/examples/quick/controls/texteditor/qml/images/qt-logo.png b/examples/quick/controls/texteditor/qml/images/qt-logo.png Binary files differindex 6dedc8bf..be1bb106 100644 --- a/examples/quick/controls/texteditor/qml/images/qt-logo.png +++ b/examples/quick/controls/texteditor/qml/images/qt-logo.png diff --git a/examples/quick/controls/texteditor/src/documenthandler.cpp b/examples/quick/controls/texteditor/src/documenthandler.cpp index 9ce73dbc..bdecf5ba 100644 --- a/examples/quick/controls/texteditor/src/documenthandler.cpp +++ b/examples/quick/controls/texteditor/src/documenthandler.cpp @@ -143,7 +143,6 @@ void DocumentHandler::saveAs(const QUrl &arg, const QString &fileType) } f.write((isHtml ? m_doc->toHtml() : m_doc->toPlainText()).toLocal8Bit()); f.close(); - qDebug() << "saved to" << localPath; setFileUrl(QUrl::fromLocalFile(localPath)); } diff --git a/examples/quick/extras/dashboard/images/fuel-icon.png b/examples/quick/extras/dashboard/images/fuel-icon.png Binary files differindex f521e905..70da758c 100644 --- a/examples/quick/extras/dashboard/images/fuel-icon.png +++ b/examples/quick/extras/dashboard/images/fuel-icon.png diff --git a/examples/quick/extras/gallery/images/center.png b/examples/quick/extras/gallery/images/center.png Binary files differindex b18a5fa8..fd369640 100644 --- a/examples/quick/extras/gallery/images/center.png +++ b/examples/quick/extras/gallery/images/center.png |
