diff --git a/src/qml/debugger/qqmldebug.h b/src/qml/debugger/qqmldebug.h
index 876d068..bb90c4f 100644
--- a/src/qml/debugger/qqmldebug.h
+++ b/src/qml/debugger/qqmldebug.h
@@ -35,6 +35,7 @@
#define QQMLDEBUG_H
#include <QtQml/qtqmlglobal.h>
+#include <QtCore/qstring.h>
QT_BEGIN_NAMESPACE
@@ -42,6 +43,8 @@ QT_BEGIN_NAMESPACE
struct Q_QML_EXPORT QQmlDebuggingEnabler
{
QQmlDebuggingEnabler(bool printWarning = true);
+ static bool startTcpDebugServer(int port, bool block = false,
+ const QString &hostName = QString());
};
// Execute code in constructor before first QQmlEngine is instantiated
diff --git a/src/qml/jsapi/qjsengine.h b/src/qml/jsapi/qjsengine.h
index bddc6f1..123eb72 100644
--- a/src/qml/jsapi/qjsengine.h
+++ b/src/qml/jsapi/qjsengine.h
@@ -127,6 +127,8 @@ inline QVariant qjsvalue_cast<QVariant>(const QJSValue &value)
return value.toVariant();
}
+Q_QML_EXPORT QJSEngine *qjsEngine(const QObject *);
+
QT_END_NAMESPACE
#endif // QJSENGINE_H
diff --git a/src/qml/jsapi/qjsvalue.h b/src/qml/jsapi/qjsvalue.h
index d184cf6..88ccac4 100644
--- a/src/qml/jsapi/qjsvalue.h
+++ b/src/qml/jsapi/qjsvalue.h
@@ -41,7 +41,6 @@
QT_BEGIN_NAMESPACE
-
class QJSValue;
class QJSEngine;
class QVariant;
@@ -50,7 +49,10 @@ struct QMetaObject;
class QDateTime;
typedef QList<QJSValue> QJSValueList;
-class QJSValuePrivate;
+namespace QV4 {
+ struct ExecutionEngine;
+ struct Value;
+}
class Q_QML_EXPORT QJSValue
{
@@ -65,6 +67,12 @@ public:
~QJSValue();
QJSValue(const QJSValue &other);
+#ifdef Q_COMPILER_RVALUE_REFS
+ inline QJSValue(QJSValue && other) : d(other.d) { other.d = 0; }
+ inline QJSValue &operator=(QJSValue &&other)
+ { qSwap(d, other.d); return *this; }
+#endif
+
QJSValue(bool value);
QJSValue(int value);
QJSValue(uint value);
@@ -125,13 +133,13 @@ public:
QT_DEPRECATED QJSEngine *engine() const;
#endif
- QJSValue(QJSValuePrivate *dd);
+ QJSValue(QV4::ExecutionEngine *e, quint64 val);
private:
friend class QJSValuePrivate;
// force compile error, prevent QJSValue(bool) to be called
QJSValue(void *) Q_DECL_EQ_DELETE;
- QJSValuePrivate *d;
+ mutable quintptr d;
};
QT_END_NAMESPACE
diff --git a/src/qml/jsapi/qjsvalueiterator.h b/src/qml/jsapi/qjsvalueiterator.h
index 0cca5a9..7ef348a 100644
--- a/src/qml/jsapi/qjsvalueiterator.h
+++ b/src/qml/jsapi/qjsvalueiterator.h
@@ -78,7 +78,6 @@ class QQmlExpression;
class QQmlContext;
class QQmlType;
class QUrl;
-class QScriptContext;
class QNetworkAccessManager;
class QQmlNetworkAccessManagerFactory;
class QQmlIncubationController;
diff --git a/src/qml/qml/qqmlerror.h b/src/qml/qml/qqmlerror.h
index af0d7e1..46c27ad 100644
--- a/src/qml/qml/qqmlerror.h
+++ b/src/qml/qml/qqmlerror.h
@@ -68,8 +68,6 @@ public:
const char *data() const;
QByteArray dataByteArray() const;
- QByteArray metaData(const QString &) const;
-
void load(QQmlEngine *, const QUrl &);
void load(QQmlEngine *, const QString &);
@@ -84,24 +82,11 @@ public:
static bool isSynchronous(const QString &url);
static bool isSynchronous(const QUrl &url);
- static bool isBundle(const QString &url);
- static bool isBundle(const QUrl &url);
-
static bool isLocalFile(const QString &url);
static bool isLocalFile(const QUrl &url);
static QString urlToLocalFileOrQrc(const QString &);
static QString urlToLocalFileOrQrc(const QUrl &);
-
- static bool bundleDirectoryExists(const QString &, QQmlEngine *);
- static bool bundleDirectoryExists(const QUrl &, QQmlEngine *);
-
- static bool bundleFileExists(const QString &, QQmlEngine *);
- static bool bundleFileExists(const QUrl &, QQmlEngine *);
-
- static QString bundleFileName(const QString &, QQmlEngine *);
- static QString bundleFileName(const QUrl &, QQmlEngine *);
-
private:
Q_DISABLE_COPY(QQmlFile)
QQmlFilePrivate *d;
diff --git a/src/qml/qml/qqmlfileselector.h b/src/qml/qml/qqmlfileselector.h
index ea73900..d86908e 100644
--- a/src/qml/qml/qqmlfileselector.h
+++ b/src/qml/qml/qqmlfileselector.h
_______________________________________________
Development mailing list
[email protected]
http://lists.qt-project.org/mailman/listinfo/development
