aboutsummaryrefslogtreecommitdiffstats
path: root/examples/quick/embeddedinwidgets
Commit message (Collapse)AuthorAgeFilesLines
* Updated license headersJani Heikkinen2016-01-203-48/+99
| | | | | | | | | | | From Qt 5.7 -> examples are lisenced under BSD license, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new BSD header instead of LGPL21 one (in those files which will be under BSD) Change-Id: I09ba19590e9425d5116a6c27cbc183debb485dde Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Port examples to new connection syntax.Friedemann Kleint2015-07-221-6/+5
| | | | | Change-Id: I121c59ac0ad56acb4cd54b99ecd37567368385ce Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Update copyright headersJani Heikkinen2015-02-123-21/+21
| | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I61120571787870c0ed17066afb31779b1e6e30e9 Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
* Update license headers and add new licensesJani Heikkinen2014-08-253-57/+33
| | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: I84a565e2e0caa3b76bf291a7d188a57a4b00e1b0 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* Add some error handling to the QWindowContainer example.Friedemann Kleint2014-03-051-13/+59
| | | | | | | | | Use a QMainWindow and display errors occurring during loading QML as well as scene graph errors (for example, failure to create an Open GL context) in the status bar. Change-Id: Id9cf190e8a4f40de0f18ab081e2747135221bb88 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* Added an example of the window container embedding a QQuickViewGunnar Sletta2013-01-255-0/+280
Change-Id: I451716f4a0eac2020835a9e8a0d67626b981c736 Reviewed-by: Alan Alpert <aalpert@rim.com>