summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Alpert <aalpert@blackberry.com>2013-04-30 15:44:19 -0700
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-06-04 01:07:29 +0200
commit4a1505d5177d42ad2369d207be402a7846fd564a (patch)
tree087a52a0cf9a551f1fbc18ee8e1338a7ca934913
parent12dc36cb4bd03065098fd9836b87132760151a90 (diff)
Fix VS2010 compile warning
warning C4510: 'QQmlPrivate::RegisterCompositeType' : default constructor could not be generated Backport of a11f4e4318b3b9d04faf533b68809937fb2208e2 from qtdeclarative Task-number: QTBUG-30454 Change-Id: I16ec8995ac1df3c92353006473ca082c4ed4e5b8 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-rw-r--r--src/declarative/qml/qdeclarativeprivate.h3
1 files changed, 2 insertions, 1 deletions
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;