[Development] Qt 5.5.0 header diff: QtQml.diff

[Simon Hausmann]

On Friday, June 05, 2015 10:11:30 AM Frederik Gladhorn wrote:
> 

There's a bug in this diff:

--- 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;

Those changes were not on qqmlerror.h but on qqmlfile.h. However the class in 
question - while exported - is marked as \internal in the docs.

If it's ok with everyone, then I'll rename qqmfile.h into qqmlfile_p.h.



Simon