aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmlfile.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Update license headers and add new licensesJani Heikkinen2014-08-251-19/+11
| | | | | | | | | - 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>
* Use QUrl::toLocalFile() when decoding a string URLAndrew Knight2014-03-181-8/+3
| | | | | | | | | | | | | | | Some percent-decoded characters may still be present in the string URL, so it is best to use QUrl::toLocalFile() to process the string properly. This also makes some drive handling "magic" obselete as QUrl already handles this. This fixes an issue whereby QML apps residing in local paths requiring percent-encoded characters (or which import local file URLs with percent-encoded characters) would fail to load, as the path was passed to the file system engine without fully decoding the URL. Change-Id: I8ec2b06f0661e0ac7cc9df79d35ec5cee211f672 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Fix needless conversion from char * to QStringKai Koehne2013-08-091-20/+20
| | | | | | | | | Converting the strings to UTF-16 unconditionally whenever the library is loaded is overkill. Anyhow, the literals are only passed to methods also accepting a QLatin1String, so we don't have to convert at all. Change-Id: I84e813ac989344bc2e359f340696423766392c93 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Remove unused local variablesKai Koehne2013-08-091-3/+0
| | | | | Change-Id: I910c47cd404c0c5c1c324e956927966e834b488e Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Android: Support implicit import paths for assets:/ urlsEskil Abrahamsen Blomfeldt2013-04-051-4/+62
| | | | | | | | | | | | | | The assets: scheme is not handled by QNetworkAccessManager, so it needs to be special cased along side the qrc: scheme. We make QML recognize it as a synchronously loaded, local file, and we make the type loader get the correct path and check existence of the directory correctly. This makes it possible to implicitly import the containing directory of QML files that are bundled in the assets directory. Task-number: QTBUG-30510 Change-Id: I048292757e509066a4af342081ec8428e2bd8af3 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-101-1/+1
| | | | | | Change-Id: I6c3bd7bebe3d62d1cfd0fa6334544c9db8398c76 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-231-24/+24
| | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: Ie7f5d49ed8235d7a7845ab68f99ad1c220e64d5c Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Mark QQmlFile \internalBea Lam2012-08-021-0/+2
| | | | | Change-Id: Ia323e76f5922ef5c539243e2f834fbc9065451e6 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Correctly resolve qrc:/ URLs in type loadingMatthew Vogt2012-06-251-11/+11
| | | | | | | | | | | URLS specified with the qrc scheme do not use the 'authority' part of the syntax, and therefore do not necessarily contain a double slash immediately after the scheme. Task-number: QTBUG-25937 Change-Id: I49156b463f11dbb38d6a01d30ea934b0a652c8e5 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Avoid string-based lookup of signalsKent Hansen2012-06-011-5/+5
| | | | | Change-Id: I5b83b5d07b6a5d2de86d0f37471cf59baa7b0e43 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Fix invalid qdoc inputAlan Alpert2012-05-141-1/+2
| | | | | Change-Id: I0f6143d7b8f816f0d55281c7ba0eec8248ce1cbe Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Initial bundle supportAaron Kennedy2012-05-041-0/+804
Change-Id: I095249f64ecf4ef1e3fbfb164e3d50edffab61e8 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 08:26:28 +0000