Pastebin URL (expires in 24 hours):
http://paste.fedoraproject.org/51637/13836114
---
diff --git a/src/qml/debugger/qqmldebug.h b/src/qml/debugger/qqmldebug.h
index d2b0220..d6b6bb0 100644
--- a/src/qml/debugger/qqmldebug.h
+++ b/src/qml/debugger/qqmldebug.h
@@ -54,9 +54,9 @@ struct Q_QML_EXPORT QQmlDebuggingEnabler
// Execute code in constructor before first QQmlEngine is instantiated
#if defined(QT_QML_DEBUG_NO_WARNING)
-static QQmlDebuggingEnabler qmlEnableDebuggingHelper(false);
-#elif defined(QT_QML_DEBUG) || defined(QT_DECLARATIVE_DEBUG)
-static QQmlDebuggingEnabler qmlEnableDebuggingHelper(true);
+static QQmlDebuggingEnabler qQmlEnableDebuggingHelper(false);
+#elif defined(QT_QML_DEBUG)
+static QQmlDebuggingEnabler qQmlEnableDebuggingHelper(true);
#endif
QT_END_NAMESPACE
diff --git a/src/qml/qml/qqml.h b/src/qml/qml/qqml.h
index b48a776..6082fcd 100644
--- a/src/qml/qml/qqml.h
+++ b/src/qml/qml/qqml.h
@@ -428,8 +428,22 @@ namespace QtQml {
Q_QML_EXPORT QObject *qmlAttachedPropertiesObject(int *, const QObject *,
const QMetaObject *, bool create);
}
+
+#ifdef Q_CC_CLANG
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wheader-hygiene"
+#endif
+
+// This is necessary to allow for QtQuick1 and QtQuick2 scenes in a single application.
using namespace QtQml;
+#ifdef Q_CC_CLANG
+#pragma clang diagnostic pop
+#endif
+
+//The C++ version of protected namespaces in qmldir
+Q_QML_EXPORT bool qmlProtectModule(const char* uri, int majVersion);
+
template<typename T>
QObject *qmlAttachedPropertiesObject(const QObject *obj, bool create = true)
{
diff --git a/src/qml/qml/qqmlcomponent.h b/src/qml/qml/qqmlcomponent.h
index aefad47..fe376d0 100644
--- a/src/qml/qml/qqmlcomponent.h
+++ b/src/qml/qml/qqmlcomponent.h
@@ -56,7 +56,7 @@ class QByteArray;
class QQmlEngine;
class QQmlComponent;
class QQmlIncubator;
-class QQmlV8Function;
+class QQmlV4Function;
class QQmlCompiledData;
class QQmlComponentPrivate;
class QQmlComponentAttached;
@@ -120,8 +120,8 @@ Q_SIGNALS:
protected:
QQmlComponent(QQmlComponentPrivate &dd, QObject* parent);
- Q_INVOKABLE void createObject(QQmlV8Function *);
- Q_INVOKABLE void incubateObject(QQmlV8Function *);
+ Q_INVOKABLE void createObject(QQmlV4Function *);
+ Q_INVOKABLE void incubateObject(QQmlV4Function *);
private:
QQmlComponent(QQmlEngine *, QQmlCompiledData *, int, QObject *parent);
@@ -129,6 +129,7 @@ private:
Q_DISABLE_COPY(QQmlComponent)
friend class QQmlVME;
friend class QQmlTypeData;
+ friend class QmlObjectCreator;
};
QT_END_NAMESPACE
diff --git a/src/qml/qml/qqmlerror.h b/src/qml/qml/qqmlerror.h
index cea9ee4..e69b3c1 100644
--- a/src/qml/qml/qqmlerror.h
+++ b/src/qml/qml/qqmlerror.h
@@ -49,7 +49,6 @@
QT_BEGIN_NAMESPACE
-
class QDebug;
class QQmlErrorPrivate;
class Q_QML_EXPORT QQmlError
@@ -70,6 +69,8 @@ public:
void setLine(int);
int column() const;
void setColumn(int);
+ QObject *object() const;
+ void setObject(QObject *);
QString toString() const;
private:
diff --git a/src/qml/qml/qqmlexpression.h b/src/qml/qml/qqmlexpression.h
index b04abc1..b702a37 100644
--- a/src/qml/qml/qqmlexpression.h
+++ b/src/qml/qml/qqmlexpression.h
@@ -91,14 +91,6 @@ public:
Q_SIGNALS:
void valueChanged();
-protected:
- QQmlExpression(QQmlContextData *, QObject *, const QString &,
- QQmlExpressionPrivate &dd);
- QQmlExpression(QQmlContextData *, QObject *, const QString &, bool,
- const QString &, int, int, QQmlExpressionPrivate &dd);
- QQmlExpression(QQmlContextData *, QObject *, const QByteArray &, bool,
- const QString &, int, int, QQmlExpressionPrivate &dd);
-
private:
QQmlExpression(QQmlContextData *, QObject *, const QString &);
diff --git a/src/qml/qml/qqmlprivate.h b/src/qml/qml/qqmlprivate.h
index b5b11d2..15306cb 100644
--- a/src/qml/qml/qqmlprivate.h
+++ b/src/qml/qml/qqmlprivate.h
@@ -260,12 +260,21 @@ namespace QQmlPrivate
const char *typeName;
};
+ struct RegisterCompositeSingletonType {
+ QUrl url;
+ const char *uri;
+ int versionMajor;
+ int versionMinor;
+ const char *typeName;
+ };
+
enum RegistrationType {
TypeRegistration = 0,
InterfaceRegistration = 1,
AutoParentRegistration = 2,
SingletonRegistration = 3,
- CompositeRegistration = 4
+ CompositeRegistration = 4,
+ CompositeSingletonRegistration = 5
};
int Q_QML_EXPORT qmlregister(RegistrationType, void *);
_______________________________________________
Development mailing list
[email protected]
http://lists.qt-project.org/mailman/listinfo/development
