diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-09 10:28:48 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-09 10:28:48 +0200 |
| commit | 5517c63c2eb601f3a9a2cb1e43d21b5e662b18cc (patch) | |
| tree | 9b8e50a5312dc17d388f3425ffb9ea9fb0db6bef /src/qml/qml/qqmlcomponent.cpp | |
| parent | c3cbbf362c769b065fd0586b0510d043cbae92a4 (diff) | |
| parent | 45f79dc7e572c1a1e4c40633d5055d0c6741cfbe (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
src/qml/qml/qqmlcomponent.cpp
tests/auto/quick/scenegraph/tst_scenegraph.cpp
Change-Id: Ibc811b95a57f175ca53337db7bbd1f575a745937
Diffstat (limited to 'src/qml/qml/qqmlcomponent.cpp')
| -rw-r--r-- | src/qml/qml/qqmlcomponent.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp index 9c7b4fe1c0..5a440bdaf4 100644 --- a/src/qml/qml/qqmlcomponent.cpp +++ b/src/qml/qml/qqmlcomponent.cpp @@ -61,6 +61,7 @@ #include <private/qv4objectiterator_p.h> #include <private/qv4qobjectwrapper_p.h> +#include <QDir> #include <QStack> #include <QStringList> #include <QThreadStorage> @@ -549,7 +550,8 @@ QQmlComponent::QQmlComponent(QQmlEngine *engine, const QString &fileName, : QQmlComponent(engine, parent) { Q_D(QQmlComponent); - d->loadUrl(d->engine->baseUrl().resolved(QUrl::fromLocalFile(fileName)), mode); + const QUrl url = QDir::isAbsolutePath(fileName) ? QUrl::fromLocalFile(fileName) : d->engine->baseUrl().resolved(QUrl(fileName)); + d->loadUrl(url, mode); } /*! |