diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-04 19:50:51 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-04 19:50:51 +0200 |
| commit | a469bc673b20751eaaedd29c3efb9462ae148538 (patch) | |
| tree | 8313f3e2c6806aad2b0c84bf04f12a4b2908bd9c /src/declarative/qml | |
| parent | 7f1bcb38ef61b2af9ff50c1ae474ed38fa901755 (diff) | |
| parent | 4a1505d5177d42ad2369d207be402a7846fd564a (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
sync.profile
Change-Id: I9d0d430d894c4ba1409e19ff9244cf94937eb021
Diffstat (limited to 'src/declarative/qml')
| -rw-r--r-- | src/declarative/qml/parser/qdeclarativejs.g | 1 | ||||
| -rw-r--r-- | src/declarative/qml/qdeclarativeprivate.h | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/qml/parser/qdeclarativejs.g b/src/declarative/qml/parser/qdeclarativejs.g index 19364c3f..dc466aec 100644 --- a/src/declarative/qml/parser/qdeclarativejs.g +++ b/src/declarative/qml/parser/qdeclarativejs.g @@ -1,7 +1,6 @@ ---------------------------------------------------------------------------- -- -- Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). --- All rights reserved. -- Contact: http://www.qt-project.org/legal -- -- This file is part of the QtDeclarative module of the Qt Toolkit. diff --git a/src/declarative/qml/qdeclarativeprivate.h b/src/declarative/qml/qdeclarativeprivate.h index 05a457c3..6f95dde7 100644 --- a/src/declarative/qml/qdeclarativeprivate.h +++ b/src/declarative/qml/qdeclarativeprivate.h @@ -55,6 +55,7 @@ #include <QtDeclarative/qtdeclarativeglobal.h> #include <QtCore/qvariant.h> +#include <QtCore/qurl.h> QT_BEGIN_NAMESPACE @@ -232,7 +233,7 @@ namespace QDeclarativePrivate }; struct RegisterComponent { - const QUrl &url; + QUrl url; const char *uri; const char *typeName; int majorVersion; |