summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qmlexpression_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/declarative/qml/qmlexpression_p.h')
-rw-r--r--src/declarative/qml/qmlexpression_p.h13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/declarative/qml/qmlexpression_p.h b/src/declarative/qml/qmlexpression_p.h
index 98ef856..57a3ce2 100644
--- a/src/declarative/qml/qmlexpression_p.h
+++ b/src/declarative/qml/qmlexpression_p.h
@@ -53,12 +53,15 @@
// We mean it.
//
-#include <private/qmlbasicscript_p.h>
#include "qmlexpression.h"
-#include <private/qmlengine_p.h>
-#include <private/qguard_p.h>
+
+#include "qmlbasicscript_p.h"
+#include "qmlengine_p.h"
+
#include <QtScript/qscriptvalue.h>
+#include <private/qguard_p.h>
+
QT_BEGIN_NAMESPACE
class QmlAbstractExpression
@@ -103,7 +106,7 @@ public:
bool isShared;
- QUrl url;
+ QString url; // This is a QString for a reason. QUrls are slooooooow...
int line;
struct SignalGuard : public QGuard<QObject> {
@@ -143,7 +146,7 @@ public:
};
void init(QmlContext *, const QString &, QObject *);
- void init(QmlContext *, void *, QmlRefCount *, QObject *, const QUrl &, int);
+ void init(QmlContext *, void *, QmlRefCount *, QObject *, const QString &, int);
QmlExpressionData *data;