Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (22 commits)
  Regression fix for Loader anchors not working
  Make Qt.include() work for js files that have '.pragma library'
  doc fix
  Improve docs for Qt.quit()
  Prevent assignment of values (string, number, bool)  to signal handlers.
  Make sure strings are escaped when returned via asScript.
  Documentation
  git ignore stuff
  Test Qt.labs.folderlistmodel plugin
  Fix naming.
  Sometimes you own QNetworkReply, sometimes you don't.
  Rename files; fix test.
  Add parent parameter to QDeclarativeExpression constructor.
  Round correctly in binding optimizer
  Don't disable SmoothPixmapTransform in qDrawBorderPixmap()
  Photoviewer example fixes.
  Port from QListModelInterface to QAbstractListModel.
  Use QDeclarativeScriptString for ParentChange.
  Set raster + gl viewport as the default for OS X.
  Move stuff from QML viewer to plugins.
  ...

6 files changed, 7 insertions, 556 deletions

diff --git a/tools/qml/content/Browser.qml b/tools/qml/content/Browser.qml
index c3a2cc0..fe7ad9c 100644
--- a/tools/qml/content/Browser.qml
+++ b/tools/qml/content/Browser.qml
@@ -1,4 +1,5 @@
 import Qt 4.7
+import Qt.labs.folderlistmodel 1.0
 
 Rectangle {
     id: root
diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp
index 380f5cc..18e2531 100644
--- a/tools/qml/main.cpp
+++ b/tools/qml/main.cpp
@@ -50,7 +50,6 @@
 #include <QDebug>
 #include <QMessageBox>
 #include "qdeclarativetester.h"
-#include "qdeclarativefolderlistmodel.h"
 
 QT_USE_NAMESPACE
 
@@ -181,7 +180,7 @@ int main(int argc, char ** argv)
     atexit(showWarnings);
 #endif
 
-#if defined (Q_WS_X11)
+#if defined (Q_WS_X11) || defined (Q_WS_MAC)
     //### default to using raster graphics backend for now
     bool gsSpecified = false;
     for (int i = 0; i < argc; ++i) {
@@ -203,7 +202,6 @@ int main(int argc, char ** argv)
 
     QDeclarativeViewer::registerTypes();
     QDeclarativeTester::registerTypes();
-    QDeclarativeFolderListModel::registerTypes();
 
     bool frameless = false;
     QString fileName;
@@ -236,6 +234,10 @@ int main(int argc, char ** argv)
     useNativeFileBrowser = false;
 #endif
 
+#if defined(Q_WS_MAC)
+    useGL = true;
+#endif
+
     for (int i = 1; i < argc; ++i) {
         bool lastArg = (i == argc - 1);
         QString arg = argv[i];
diff --git a/tools/qml/qdeclarativefolderlistmodel.cpp b/tools/qml/qdeclarativefolderlistmodel.cpp
deleted file mode 100644
index 7ac25d6..0000000
--- a/tools/qml/qdeclarativefolderlistmodel.cpp
+++ /dev/null
@@ -1,423 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qdeclarativefolderlistmodel.h"
-#include <QDirModel>
-#include <QDebug>
-#include <qdeclarativecontext.h>
-
-QT_BEGIN_NAMESPACE
-
-class QDeclarativeFolderListModelPrivate
-{
-public:
-    QDeclarativeFolderListModelPrivate()
-        : sortField(QDeclarativeFolderListModel::Name), sortReversed(false), count(0) {
-        nameFilters << QLatin1String("*");
-    }
-
-    void updateSorting() {
-        QDir::SortFlags flags = 0;
-        switch(sortField) {
-        case QDeclarativeFolderListModel::Unsorted:
-            flags |= QDir::Unsorted;
-            break;
-        case QDeclarativeFolderListModel::Name:
-            flags |= QDir::Name;
-            break;
-        case QDeclarativeFolderListModel::Time:
-            flags |= QDir::Time;
-            break;
-        case QDeclarativeFolderListModel::Size:
-            flags |= QDir::Size;
-            break;
-        case QDeclarativeFolderListModel::Type:
-            flags |= QDir::Type;
-            break;
-        }
-
-        if (sortReversed)
-            flags |= QDir::Reversed;
-
-        model.setSorting(flags);
-    }
-
-    QDirModel model;
-    QUrl folder;
-    QStringList nameFilters;
-    QModelIndex folderIndex;
-    QDeclarativeFolderListModel::SortField sortField;
-    bool sortReversed;
-    int count;
-};
-
-/*!
-    \qmlclass FolderListModel
-    \brief The FolderListModel provides a model of the contents of a folder in a filesystem.
-
-    FolderListModel provides access to the local filesystem.  The \e folder property
-    specifies the folder to list.
-
-    Qt uses "/" as a universal directory separator in the same way that "/" is
-    used as a path separator in URLs. If you always use "/" as a directory
-    separator, Qt will translate your paths to conform to the underlying
-    operating system.
-
-    The roles available are:
-    \list
-    \o fileName
-    \o filePath
-    \endlist
-
-    Additionally a file entry can be differentiated from a folder entry
-    via the \l isFolder() method.
-*/
-
-QDeclarativeFolderListModel::QDeclarativeFolderListModel(QObject *parent)
-    : QListModelInterface(parent)
-{
-    d = new QDeclarativeFolderListModelPrivate;
-    d->model.setFilter(QDir::AllDirs | QDir::Files | QDir::Drives | QDir::NoDotAndDotDot);
-    connect(&d->model, SIGNAL(rowsInserted(const QModelIndex&,int,int))
-            , this, SLOT(inserted(const QModelIndex&,int,int)));
-    connect(&d->model, SIGNAL(rowsRemoved(const QModelIndex&,int,int))
-            , this, SLOT(removed(const QModelIndex&,int,int)));
-    connect(&d->model, SIGNAL(dataChanged(const QModelIndex&,const QModelIndex&))
-            , this, SLOT(dataChanged(const QModelIndex&,const QModelIndex&)));
-    connect(&d->model, SIGNAL(modelReset()), this, SLOT(refresh()));
-    connect(&d->model, SIGNAL(layoutChanged()), this, SLOT(refresh()));
-}
-
-QDeclarativeFolderListModel::~QDeclarativeFolderListModel()
-{
-    delete d;
-}
-
-QHash<int,QVariant> QDeclarativeFolderListModel::data(int index, const QList<int> &roles) const
-{
-    Q_UNUSED(roles);
-    QHash<int,QVariant> folderData;
-    QModelIndex modelIndex = d->model.index(index, 0, d->folderIndex);
-    if (modelIndex.isValid()) {
-        folderData[QDirModel::FileNameRole] = d->model.data(modelIndex, QDirModel::FileNameRole);
-        folderData[QDirModel::FilePathRole] = QUrl::fromLocalFile(d->model.data(modelIndex, QDirModel::FilePathRole).toString());
-    }
-
-    return folderData;
-}
-
-QVariant QDeclarativeFolderListModel::data(int index, int role) const
-{
-    QVariant rv;
-    QModelIndex modelIndex = d->model.index(index, 0, d->folderIndex);
-    if (modelIndex.isValid()) {
-        if (role == QDirModel::FileNameRole)
-            rv = d->model.data(modelIndex, QDirModel::FileNameRole);
-        else if (role == QDirModel::FilePathRole)
-            rv = QUrl::fromLocalFile(d->model.data(modelIndex, QDirModel::FilePathRole).toString());
-    }
-
-    return rv;
-}
-
-int QDeclarativeFolderListModel::count() const
-{
-    return d->count;
-}
-
-QList<int> QDeclarativeFolderListModel::roles() const
-{
-    QList<int> r;
-    r << QDirModel::FileNameRole;
-    r << QDirModel::FilePathRole;
-    return r;
-}
-
-QString QDeclarativeFolderListModel::toString(int role) const
-{
-    switch (role) {
-    case QDirModel::FileNameRole:
-        return QLatin1String("fileName");
-    case QDirModel::FilePathRole:
-        return QLatin1String("filePath");
-    }
-
-    return QString();
-}
-
-/*!
-    \qmlproperty string FolderListModel::folder
-
-    The \a folder property holds the folder the model is currently providing.
-
-    It is a URL, but must be a file: or qrc: URL (or relative to such a URL).
-*/
-QUrl QDeclarativeFolderListModel::folder() const
-{
-    return d->folder;
-}
-
-void QDeclarativeFolderListModel::setFolder(const QUrl &folder)
-{
-    if (folder == d->folder)
-        return;
-    QModelIndex index = d->model.index(folder.toLocalFile());
-    if (index.isValid() && d->model.isDir(index)) {
-        d->folder = folder;
-        QMetaObject::invokeMethod(this, "refresh", Qt::QueuedConnection);
-        emit folderChanged();
-    }
-}
-
-QUrl QDeclarativeFolderListModel::parentFolder() const
-{
-    QUrl r;
-    QString localFile = d->folder.toLocalFile();
-    if (!localFile.isEmpty()) {
-        QDir dir(localFile);
-#if defined(Q_OS_SYMBIAN)
-        if (dir.isRoot())
-            dir.setPath("");
-        else
-#endif
-            dir.cdUp();
-        r = d->folder;
-        r.setPath(dir.path());
-    } else {
-        int pos = d->folder.path().lastIndexOf(QLatin1Char('/'));
-        if (pos == -1)
-            return QUrl();
-        r = d->folder;
-        r.setPath(d->folder.path().left(pos));
-    }
-    return r;
-}
-
-/*!
-    \qmlproperty list<string> FolderListModel::nameFilters
-
-    The \a nameFilters property contains a list of filename filters.
-    The filters may include the ? and * wildcards.
-
-    The example below filters on PNG and JPEG files:
-
-    \code
-    FolderListModel {
-        nameFilters: [ "*.png", "*.jpg" ]
-    }
-    \endcode
-*/
-QStringList QDeclarativeFolderListModel::nameFilters() const
-{
-    return d->nameFilters;
-}
-
-void QDeclarativeFolderListModel::setNameFilters(const QStringList &filters)
-{
-    d->nameFilters = filters;
-    d->model.setNameFilters(d->nameFilters);
-}
-
-void QDeclarativeFolderListModel::classBegin()
-{
-}
-
-void QDeclarativeFolderListModel::componentComplete()
-{
-    if (!d->folder.isValid() || !QDir().exists(d->folder.toLocalFile()))
-        setFolder(QUrl(QLatin1String("file://")+QDir::currentPath()));
-
-    if (!d->folderIndex.isValid())
-        QMetaObject::invokeMethod(this, "refresh", Qt::QueuedConnection);
-}
-
-QDeclarativeFolderListModel::SortField QDeclarativeFolderListModel::sortField() const
-{
-    return d->sortField;
-}
-
-void QDeclarativeFolderListModel::setSortField(SortField field)
-{
-    if (field != d->sortField) {
-        d->sortField = field;
-        d->updateSorting();
-    }
-}
-
-bool QDeclarativeFolderListModel::sortReversed() const
-{
-    return d->sortReversed;
-}
-
-void QDeclarativeFolderListModel::setSortReversed(bool rev)
-{
-    if (rev != d->sortReversed) {
-        d->sortReversed = rev;
-        d->updateSorting();
-    }
-}
-
-/*!
-    \qmlmethod bool FolderListModel::isFolder(int index)
-
-    Returns true if the entry \a index is a folder; otherwise
-    returns false.
-*/
-bool QDeclarativeFolderListModel::isFolder(int index) const
-{
-    if (index != -1) {
-        QModelIndex idx = d->model.index(index, 0, d->folderIndex);
-        if (idx.isValid())
-            return d->model.isDir(idx);
-    }
-    return false;
-}
-
-void QDeclarativeFolderListModel::refresh()
-{
-    d->folderIndex = QModelIndex();
-    if (d->count) {
-        int tmpCount = d->count;
-        d->count = 0;
-        emit itemsRemoved(0, tmpCount);
-    }
-    d->folderIndex = d->model.index(d->folder.toLocalFile());
-    d->count = d->model.rowCount(d->folderIndex);
-    if (d->count) {
-        emit itemsInserted(0, d->count);
-    }
-}
-
-void QDeclarativeFolderListModel::inserted(const QModelIndex &index, int start, int end)
-{
-    if (index == d->folderIndex) {
-        d->count = d->model.rowCount(d->folderIndex);
-        emit itemsInserted(start, end - start + 1);
-    }
-}
-
-void QDeclarativeFolderListModel::removed(const QModelIndex &index, int start, int end)
-{
-    if (index == d->folderIndex) {
-        d->count = d->model.rowCount(d->folderIndex);
-        emit itemsRemoved(start, end - start + 1);
-    }
-}
-
-void QDeclarativeFolderListModel::dataChanged(const QModelIndex &start, const QModelIndex &end)
-{
-    if (start.parent() == d->folderIndex)
-        emit itemsChanged(start.row(), end.row() - start.row() + 1, roles());
-}
-
-/*!
-    \qmlproperty bool FolderListModel::showDirs
-
-    If true (the default), directories are included in the model.
-
-    Note that the nameFilters are ignored for directories.
-*/
-bool QDeclarativeFolderListModel::showDirs() const
-{
-    return d->model.filter() & QDir::AllDirs;
-}
-
-void  QDeclarativeFolderListModel::setShowDirs(bool on)
-{
-    if (!(d->model.filter() & QDir::AllDirs) == !on)
-        return;
-    if (on)
-        d->model.setFilter(d->model.filter() | QDir::AllDirs | QDir::Drives);
-    else
-        d->model.setFilter(d->model.filter() & ~(QDir::AllDirs | QDir::Drives));
-}
-
-/*!
-    \qmlproperty bool FolderListModel::showDotAndDotDot
-
-    If true, the "." and ".." directories are included in the model.
-
-    The default is false.
-*/
-bool QDeclarativeFolderListModel::showDotAndDotDot() const
-{
-    return !(d->model.filter() & QDir::NoDotAndDotDot);
-}
-
-void  QDeclarativeFolderListModel::setShowDotAndDotDot(bool on)
-{
-    if (!(d->model.filter() & QDir::NoDotAndDotDot) == on)
-        return;
-    if (on)
-        d->model.setFilter(d->model.filter() & ~QDir::NoDotAndDotDot);
-    else
-        d->model.setFilter(d->model.filter() | QDir::NoDotAndDotDot);
-}
-
-/*!
-    \qmlproperty bool FolderListModel::showOnlyReadable
-
-    If true, only readable files and directories are shown.
-
-    The default is false.
-*/
-bool QDeclarativeFolderListModel::showOnlyReadable() const
-{
-    return d->model.filter() & QDir::Readable;
-}
-
-void QDeclarativeFolderListModel::setShowOnlyReadable(bool on)
-{
-    if (!(d->model.filter() & QDir::Readable) == !on)
-        return;
-    if (on)
-        d->model.setFilter(d->model.filter() | QDir::Readable);
-    else
-        d->model.setFilter(d->model.filter() & ~QDir::Readable);
-}
-
-void QDeclarativeFolderListModel::registerTypes()
-{
-    qmlRegisterType<QDeclarativeFolderListModel>("Qt",4,7,"FolderListModel");
-}
-
-QT_END_NAMESPACE
-
diff --git a/tools/qml/qdeclarativefolderlistmodel.h b/tools/qml/qdeclarativefolderlistmodel.h
deleted file mode 100644
index 1ecc784..0000000
--- a/tools/qml/qdeclarativefolderlistmodel.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QDECLARATIVEFOLDERLISTMODEL_H
-#define QDECLARATIVEFOLDERLISTMODEL_H
-
-#include <qdeclarative.h>
-#include <QStringList>
-#include <QUrl>
-#include "../../src/declarative/3rdparty/qlistmodelinterface_p.h"
-
-QT_BEGIN_NAMESPACE
-
-class QDeclarativeContext;
-class QModelIndex;
-
-class QDeclarativeFolderListModelPrivate;
-class QDeclarativeFolderListModel : public QListModelInterface, public QDeclarativeParserStatus
-{
-    Q_OBJECT
-    Q_INTERFACES(QDeclarativeParserStatus)
-
-    Q_PROPERTY(QUrl folder READ folder WRITE setFolder NOTIFY folderChanged)
-    Q_PROPERTY(QUrl parentFolder READ parentFolder NOTIFY folderChanged)
-    Q_PROPERTY(QStringList nameFilters READ nameFilters WRITE setNameFilters)
-    Q_PROPERTY(SortField sortField READ sortField WRITE setSortField)
-    Q_PROPERTY(bool sortReversed READ sortReversed WRITE setSortReversed)
-    Q_PROPERTY(bool showDirs READ showDirs WRITE setShowDirs)
-    Q_PROPERTY(bool showDotAndDotDot READ showDotAndDotDot WRITE setShowDotAndDotDot)
-    Q_PROPERTY(bool showOnlyReadable READ showOnlyReadable WRITE setShowOnlyReadable)
-
-public:
-    QDeclarativeFolderListModel(QObject *parent = 0);
-    ~QDeclarativeFolderListModel();
-
-    static void registerTypes();
-
-    virtual QHash<int,QVariant> data(int index, const QList<int> &roles = (QList<int>())) const;
-    virtual QVariant data(int index, int role) const;
-    virtual int count() const;
-    virtual QList<int> roles() const;
-    virtual QString toString(int role) const;
-
-    QUrl folder() const;
-    void setFolder(const QUrl &folder);
-
-    QUrl parentFolder() const;
-
-    QStringList nameFilters() const;
-    void setNameFilters(const QStringList &filters);
-
-    virtual void classBegin();
-    virtual void componentComplete();
-
-    Q_INVOKABLE bool isFolder(int index) const;
-
-    enum SortField { Unsorted, Name, Time, Size, Type };
-    SortField sortField() const;
-    void setSortField(SortField field);
-    Q_ENUMS(SortField)
-
-    bool sortReversed() const;
-    void setSortReversed(bool rev);
-
-    bool showDirs() const;
-    void  setShowDirs(bool);
-    bool showDotAndDotDot() const;
-    void  setShowDotAndDotDot(bool);
-    bool showOnlyReadable() const;
-    void  setShowOnlyReadable(bool);
-
-Q_SIGNALS:
-    void folderChanged();
-
-private Q_SLOTS:
-    void refresh();
-    void inserted(const QModelIndex &index, int start, int end);
-    void removed(const QModelIndex &index, int start, int end);
-    void dataChanged(const QModelIndex &start, const QModelIndex &end);
-
-private:
-    Q_DISABLE_COPY(QDeclarativeFolderListModel)
-    QDeclarativeFolderListModelPrivate *d;
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QDeclarativeFolderListModel)
-
-#endif // QDECLARATIVEFOLDERLISTMODEL_H
diff --git a/tools/qml/qml.pri b/tools/qml/qml.pri
index a2058c7..5e3e74b 100644
--- a/tools/qml/qml.pri
+++ b/tools/qml/qml.pri
@@ -10,12 +10,10 @@ HEADERS += $$PWD/qmlruntime.h \
            $$PWD/proxysettings.h \
            $$PWD/qdeclarativetester.h \
            $$PWD/deviceorientation.h \
-           $$PWD/qdeclarativefolderlistmodel.h \
            $$PWD/loggerwidget.h
 SOURCES += $$PWD/qmlruntime.cpp \
            $$PWD/proxysettings.cpp \
            $$PWD/qdeclarativetester.cpp \
-           $$PWD/qdeclarativefolderlistmodel.cpp \
            $$PWD/loggerwidget.cpp
 
 RESOURCES = $$PWD/qmlruntime.qrc
diff --git a/tools/qml/qmlruntime.cpp b/tools/qml/qmlruntime.cpp
index 9700090..490fa34 100644
--- a/tools/qml/qmlruntime.cpp
+++ b/tools/qml/qmlruntime.cpp
@@ -906,6 +906,7 @@ bool QDeclarativeViewer::open(const QString& file_or_url)
 
     QString fileName = url.toLocalFile();
     if (!fileName.isEmpty()) {
+        fi.setFile(fileName);
         if (fi.exists()) {
             if (fi.suffix().toLower() != QLatin1String("qml")) {
                 qWarning() << "qml cannot open non-QML file" << fileName;