aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmlabstracturlinterceptor.h
Commit message (Collapse)AuthorAgeFilesLines
* Update license headers and add new licensesJani Heikkinen2014-08-251-18/+10
| | | | | | | | | - 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>
* Revert "Revert ffaf39e9a7f11d4e2800b3b37160a2a952795614"Alan Alpert2013-12-041-0/+67
| | | | | | | | | | This reverts commit 27052dcad9810869a9065da4c06e9f14379411d7. While the additional flexibility would be nice, I've been reminded that we already did commit to it back in July. Change-Id: Iaf990dda98ee46eb028b4737bdeeafd050d9513f Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
* Revert ffaf39e9a7f11d4e2800b3b37160a2a952795614Alan Alpert2013-11-131-67/+0
| | | | | | | | | Making it public right now seems a little premature, given all the work happening on the engine now (and for 5.3). We'll be in a better position to commit to it or not next release. Change-Id: Ib7b14afeb9205fb8a87ed16a6d38b1f468b2bbbb Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix warnings about includes.Friedemann Kleint2013-09-251-1/+1
| | | | | | | | | QtQml: WARNING: qtdeclarative/src/qml/qml/qqmlabstracturlinterceptor.h QtQml: WARNING: qtdeclarative/src/qml/qml/qqmlfileselector.h includes qtqmlglobal.h when it should include QtQml/qtqmlglobal.h Change-Id: I1cc4e3a201e0f3bec34c5e4bca8ec1578c8b0224 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Make QQmlAbstractUrlInterceptor publicAlan Alpert2013-09-191-0/+67
A supporting class for file selectors and qml import control, it allows redirecting local file paths (use a QNAM for remote paths). All work was done previously for Qt 5.1, including tests. This is just making it public for Qt 5.2. Change-Id: Icb319cc23200541c8e4088b2d400e9af94f3eee5 Reviewed-by: Lars Knoll <lars.knoll@digia.com>