Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

7 files changed, 96 insertions, 495 deletions

diff --git a/tools/qdoc3/helpprojectwriter.cpp b/tools/qdoc3/helpprojectwriter.cpp
index 85bd898..16ee5f2 100644
--- a/tools/qdoc3/helpprojectwriter.cpp
+++ b/tools/qdoc3/helpprojectwriter.cpp
@@ -126,6 +126,9 @@ void HelpProjectWriter::readSelectors(SubProject &subproject, const QStringList
     subTypeHash["module"] = Node::Module;
     subTypeHash["page"] = Node::Page;
     subTypeHash["externalpage"] = Node::ExternalPage;
+#ifdef QDOC_QML
+    subTypeHash["qmlclass"] = Node::QmlClass;
+#endif
 
     QSet<Node::SubType> allSubTypes = QSet<Node::SubType>::fromList(subTypeHash.values());
 
diff --git a/tools/qdoc3/test/qml.qdocconf b/tools/qdoc3/test/qml.qdocconf
new file mode 100644
index 0000000..3a7d76a
--- /dev/null
+++ b/tools/qdoc3/test/qml.qdocconf
@@ -0,0 +1,77 @@
+include(compat.qdocconf)
+include(macros.qdocconf)
+include(qt-cpp-ignore.qdocconf)
+include(qt-html-templates.qdocconf)
+include(qt-defines.qdocconf)
+
+project                 = Qml
+description             = Qml Reference Documentation
+url                     = http://doc.qtsoftware.com/4.6
+
+edition.Console.modules = QtCore QtDBus QtNetwork QtScript QtSql QtXml \
+                          QtXmlPatterns QtTest
+edition.Desktop.modules = QtCore QtDBus QtGui QtNetwork QtOpenGL QtScript QtSql QtSvg \
+                          QtWebKit QtXml QtXmlPatterns Qt3Support QtHelp \
+                          QtDesigner QtAssistant QAxContainer Phonon \
+                          QAxServer QtUiTools QtTest QtDBus
+edition.DesktopLight.modules = QtCore QtDBus QtGui Qt3SupportLight QtTest
+edition.DesktopLight.groups       = -graphicsview-api
+
+qhp.projects            = Qml
+
+qhp.Qml.file                = qml.qhp
+qhp.Qml.namespace           = com.trolltech.qml.460
+qhp.Qml.virtualFolder       = qdoc
+qhp.Qml.indexTitle          = Qml Reference
+
+# Files not referenced in any qdoc file
+# See also extraimages.HTML
+qhp.Qml.extraFiles          = classic.css \
+                             images/qt-logo.png
+
+qhp.Qml.filterAttributes    = qt 4.6.0 qtrefdoc
+qhp.Qml.customFilters.Qt.name = Qt 4.6.0
+qhp.Qml.customFilters.Qt.filterAttributes = qt 4.6.0
+qhp.Qml.subprojects         = classes
+qhp.Qml.subprojects.classes.title = Elements
+qhp.Qml.subprojects.classes.indexTitle = Qml Elements
+qhp.Qml.subprojects.classes.selectors = fake:qmlclass
+qhp.Qml.subprojects.classes.sortPages = true
+
+language                = Cpp
+
+headerdirs              = $QT_SOURCE_TREE/src/declarative
+sourcedirs              = $QT_SOURCE_TREE/src/declarative \
+                          $QT_SOURCE_TREE/doc/src/declarative
+
+sources += $QT_SOURCE_TREE/doc/src/tutorials/declarative.qdoc
+
+sources.fileextensions  = "*.cpp *.qdoc"
+examples.fileextensions = "*.cpp *.h *.js *.qml"
+
+exampledirs             = $QT_SOURCE_TREE/doc/src \
+                          $QT_SOURCE_TREE/examples \
+                          $QT_SOURCE_TREE/examples/tutorials \
+                          $QT_SOURCE_TREE \
+                          $QT_SOURCE_TREE/qmake/examples \
+                          $QT_SOURCE_TREE/src/3rdparty/webkit/WebKit/qt/docs
+imagedirs               = $QT_SOURCE_TREE/doc/src/images \
+                          $QT_SOURCE_TREE/examples \
+                          $QT_SOURCE_TREE/doc/src/declarative/pics
+outputdir               = $QT_BUILD_TREE/doc-build/html-qml
+tagfile                 = $QT_BUILD_TREE/doc-build/html-qml/qt.tags
+base                    = file:$QT_BUILD_TREE/doc/html-qml
+
+HTML.stylesheets        = classic.css
+
+HTML.postheader         = "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\">\n" \
+                          "<tr>\n" \
+                          "<td align=\"left\" valign=\"top\">" \
+                          "<img src=\"images/qt-logo.png\" align=\"left\" border=\"0\"/>" \
+                          "</td>\n" \
+                          "<td width=\"1\">&nbsp;&nbsp;</td>" \
+                          "<td class=\"postheader\" valign=\"center\" align=\"left\">" \
+                          "<a href=\"qmlreference.html\">" \
+                          "<font color=\"#004faf\">Home</font></a>" \
+                          "</td>\n" \
+                          "</tr></table>"
diff --git a/tools/qdoc3/tree.cpp b/tools/qdoc3/tree.cpp
index 539db51..b91de65 100644
--- a/tools/qdoc3/tree.cpp
+++ b/tools/qdoc3/tree.cpp
@@ -1901,9 +1901,14 @@ QString Tree::fullDocumentLocation(const Node *node) const
         else
             return "";
     }
-    else if (node->type() == Node::Fake)
+    else if (node->type() == Node::Fake) {
+#ifdef QDOC_QML
+        if (node->subType() == Node::QmlClass)
+            return "qml-" + node->fileBase() + ".html";
+        else
+#endif
         return node->fileBase() + ".html";
-    else if (node->fileBase().isEmpty())
+    } else if (node->fileBase().isEmpty())
         return "";
 
     QString parentName;
diff --git a/tools/qmlconv/qmlconv.cpp b/tools/qmlconv/qmlconv.cpp
deleted file mode 100644
index 6e89530..0000000
--- a/tools/qmlconv/qmlconv.cpp
+++ /dev/null
@@ -1,482 +0,0 @@
-#include <QtCore/QCoreApplication>
-#include <QtCore/QFile>
-#include <QtCore/QXmlStreamReader>
-#include <QtCore/QStack>
-#include <QtCore/QStringList>
-#include <QtCore/QDebug>
-
-
-static bool optionInPlace = false;
-
-class Reader
-{
-    QString outString;
-    QTextStream out;
-    QXmlStreamReader xml;
-    int depth;
-    bool supressIndent;
-
-    QStringList knownListProperties;
-    inline QString depthString() {if (supressIndent) { supressIndent = false; return QString(); }
-        return QString(depth*4, QLatin1Char(' '));}
-
-public:
-    Reader(QIODevice *in)
-        :xml(in) {
-
-        knownListProperties << "states" << "transitions" << "children" << "resources"
-                << "transform" << "notes";
-        depth = 0;
-        supressIndent = false;
-
-        out.setString(&outString);
-
-        loop();
-
-        out.flush();
-
-        if (! optionInPlace) {
-            QTextStream print(stdout);
-            print << outString;
-        }
-    }
-
-    QString output() const
-    {
-        return outString;
-    }
-
-    void comment()
-    {
-        if (xml.isComment()) {
-            out << depthString() << "// "
-                << xml.text().toString().trimmed().replace(QRegExp("\n\\s*"),"\n"+depthString()+"// ")
-                << endl;
-        }
-    }
-
-    void emptyLoop() {
-        while (!xml.atEnd()) {
-            xml.readNext();
-            comment();
-            if (xml.tokenType() == QXmlStreamReader::EndElement)
-                return;
-        }
-    }
-
-    void loop()
-    {
-        while (!xml.atEnd()) {
-            xml.readNext();
-            if (xml.tokenType() == QXmlStreamReader::EndElement)
-                return;
-            else if (xml.tokenType() == QXmlStreamReader::StartElement)
-                startElement();
-            else if (xml.tokenType() == QXmlStreamReader::ProcessingInstruction) {
-                if (xml.processingInstructionTarget() == QLatin1String("qtfx")) {
-                    QString data = xml.processingInstructionData().toString().trimmed();
-                    if (data.startsWith(QLatin1String("namespacepath:="))) {
-                        outString.prepend( QLatin1String("import \"") + data.mid(data.indexOf(QLatin1Char('='))+1) + QLatin1String("\"\n"));
-                    }
-                }
-            }
-            comment();
-        }
-    }
-
-    void startElement() {
-
-        if (!propertyChangeSet.isEmpty()
-            && xml.name() != "SetProperties"
-            && xml.name() != "SetProperty") {
-            clearPropertyChangeSet();
-        }
-
-        if (false && xml.name() == "properties")
-            startDeclareProperties();
-        else if (false && xml.name() == "signals")
-            startDeclareSignals();
-        else if (false && xml.name() == "states")
-            loop(); // ignore
-        else if (false && xml.name() == "transitions")
-            loop(); // ignore
-        else if (knownListProperties.contains(xml.name().toString()))
-            startList();
-        else if (false && xml.name() == "SetProperties")
-            startSetProperties();
-        else if (false && xml.name() == "SetProperty")
-            startSetProperty();
-        else if (false && xml.name() == "ParentChange")
-            startParentChange();
-        else if (true && xml.name() == "Connection")
-            startConnection();
-        else if (false && xml.name() == "Script")
-            startScript();
-        else if (xml.name().at(0).isLower() && xml.attributes().isEmpty())
-            startObjectProperty();
-        else
-            startItem();
-    }
-
-    static void possiblyRemoveBraces(QString *s) {
-        if (s->startsWith('{') && s->endsWith('}'))
-            *s = s->mid(1, s->length() - 2);
-    }
-
-    static bool isNumber(const QString &s) {
-        bool ok = true;
-        s.toFloat(&ok);
-        return ok;
-    }
-
-    static bool isSignalHandler(const QString &s) {
-        return s.size() > 3
-                && s.startsWith("on")
-                && s.at(2).isUpper();
-    }
-
-    static bool isEnum(const QString &property, const QString &value)  {
-        return !value.contains(' ') && (property == "vAlign" || property == "hAlign"
-                                        || property == "style");
-    }
-
-    static bool isIdentifier(const QString &s) {
-        if (s.isEmpty())
-            return false;
-        if (!s.at(1).isLetter())
-            return false;
-        for (int i = 1; i < s.size(); ++i) {
-            QChar c = s.at(i);
-            if (c.isLetterOrNumber()
-                || c == QLatin1Char('_')
-                || c == QLatin1Char('-'))
-                continue;
-            return false;
-        }
-        return true;
-    }
-
-
-    void setProperty(const QString &property, const QString &value, bool newline = true) {
-        QString v = value.trimmed();
-        if (v.startsWith('{')) {
-            possiblyRemoveBraces(&v);
-        } else if (v == "true"
-                   || v == "false"
-                   || isNumber(v)
-                   || property == "id"
-                   || isEnum(property, value)
-                   ) {
-            ;
-        } else if (isSignalHandler(property)) {
-            // if not a function name, create an anonymous function
-            if (!isIdentifier(v)) {
-                v.prepend("{ ");
-                v.append(" }");
-            }
-        } else
-
-            //            if (property == "text" || property == "name" || value.contains(' ')
-            //            || value.contains("/") || value.startsWith('#')
-            //            || property == "filename" || property == "source" || property == "src"
-            //                    || property == "title" || property == "movieTitle" || property == "movieDescription"
-            //                    || property == "properties" || property == "fromState" || property == "toState"
-            //                    )
-        {
-            v.prepend('\"');
-            v.append('\"');
-        }
-
-//        QByteArray semiColon = ";";
-//        if (v.endsWith(QLatin1Char('}')) || v.endsWith(QLatin1Char(';')))
-//            semiColon.clear();
-
-        if (!newline)
-            out << property << ": " << v /* << semiColon.constData() */;
-        else
-            out << depthString() << property << ": " << v /* << semiColon.constData() */  << endl;
-    }
-
-
-    typedef QPair<QString,QString> StringPair;
-    QList<StringPair> propertyChangeSet;
-    void startItem(bool inList = false) {
-
-        QString name = xml.name().toString();
-
-        out << depthString() << name << " {" << endl;
-        ++depth;
-
-        foreach (QXmlStreamAttribute attribute, xml.attributes()) {
-            setProperty(attribute.name().toString(), attribute.value().toString());
-        }
-
-        if (name == "Script") {
-            QString text = xml.readElementText();
-            if (!text.trimmed().isEmpty()) {
-                out << text << endl;
-            }
-        } else {
-            loop();
-        }
-
-        if (name == "State")
-            clearPropertyChangeSet();
-
-        --depth;
-        out << depthString() << "}";
-        if (!inList)
-            out << endl;
-    }
-
-    void clearPropertyChangeSet() {
-        if (propertyChangeSet.isEmpty())
-            return;
-
-        out << depthString() << "PropertyChangeSet" << " {" << endl;
-        ++depth;
-        foreach(StringPair pair, propertyChangeSet)
-            setProperty(pair.first, pair.second);
-        --depth;
-        out << depthString() << "}" << endl;
-        propertyChangeSet.clear();
-    }
-
-    void startObjectProperty() {
-
-        QString name = xml.name().toString();
-        bool hasElements = false;
-        while (!xml.atEnd()) {
-            xml.readNext();
-            if (xml.tokenType() == QXmlStreamReader::EndElement)
-                break;
-            if (xml.tokenType() == QXmlStreamReader::StartElement) {
-                hasElements = true;
-                out << depthString() << name << ": ";
-                supressIndent = true;
-                startElement();
-            } else if (!hasElements && xml.tokenType() == QXmlStreamReader::Characters) {
-                if (!xml.text().toString().trimmed().isEmpty()) {
-                    setProperty(name, xml.text().toString());
-                }
-            }
-            comment();
-        }
-    }
-
-    void startDeclareProperty() {
-        out << depthString() << "public property ";
-
-        if (xml.attributes().hasAttribute("type"))
-            out << "/* " << xml.attributes().value("type").toString() << " */ ";
-
-        QString name = xml.attributes().value("name").toString();
-
-        if (xml.attributes().hasAttribute("value"))
-            setProperty(name, xml.attributes().value("value").toString(), false);
-        else out << name;
-
-        QMap<QString, QString> attributes;
-        foreach (QXmlStreamAttribute attribute, xml.attributes()) {
-            if (attribute.name() == "name" || attribute.name() == "value")
-                continue;
-            attributes.insert(attribute.name().toString(), attribute.value().toString());
-        }
-        out << endl;
-        emptyLoop();
-    }
-
-    void startDeclareProperties() {
-        while (!xml.atEnd()) {
-            xml.readNext();
-            if (xml.tokenType() == QXmlStreamReader::EndElement)
-                return;
-            if (xml.tokenType() == QXmlStreamReader::StartElement) {
-                if (xml.name() == "Property")
-                    startDeclareProperty();
-            }
-            comment();
-        }
-    }
-
-    void startDeclareSignal() {
-        out << depthString() << "public signal " << xml.attributes().value("name").toString() << endl;
-        emptyLoop();
-    }
-
-    void startDeclareSignals() {
-        while (!xml.atEnd()) {
-            xml.readNext();
-            if (xml.tokenType() == QXmlStreamReader::EndElement)
-                return;
-            if (xml.tokenType() == QXmlStreamReader::StartElement) {
-                if (xml.name() == "Signal")
-                    startDeclareSignal();
-            }
-            comment();
-        }
-    }
-
-
-    void startSetProperties() {
-        QString target = xml.attributes().value("target").toString();
-        possiblyRemoveBraces(&target);
-        foreach (QXmlStreamAttribute attribute, xml.attributes()) {
-            if (attribute.name() == "target")
-                continue;
-            propertyChangeSet += StringPair(target + "." + attribute.name().toString(), attribute.value().toString());
-        }
-        emptyLoop();
-    }
-
-    void startSetProperty() {
-        QString target = xml.attributes().value("target").toString();
-        possiblyRemoveBraces(&target);
-        propertyChangeSet += StringPair(target + "." + xml.attributes().value("property").toString(),
-                                        xml.attributes().value("value").toString());
-
-        emptyLoop();
-    }
-
-    void startParentChange() {
-        QString target = xml.attributes().value("target").toString();
-        possiblyRemoveBraces(&target);
-
-        out << depthString() << "ParentChangeSet" << " {" << endl;
-        ++depth;
-        setProperty(target + ".parent", xml.attributes().value("parent").toString());
-        --depth;
-        out << depthString() << "}" << endl;
-
-//        propertyChangeSet += StringPair(target + ".moveToParent", xml.attributes().value("parent").toString());
-
-        emptyLoop();
-    }
-
-    void startConnection() {
-        QString sender = xml.attributes().value("sender").toString();
-        possiblyRemoveBraces(&sender);
-        out << depthString() << "Connection {" << endl;
-        ++depth;
-        if (! sender.isEmpty())
-            out << depthString() << "sender: " << sender << endl;
-        if (xml.attributes().hasAttribute("signal"))
-            out << depthString() << "signal: \"" << xml.attributes().value("signal").toString() << '"' << endl;
-        if (xml.attributes().hasAttribute("script")) {
-            out << depthString() << "script: { " << xml.attributes().value("script").toString() << " }" << endl;
-            --depth;
-            out << depthString() << "}" << endl;
-        } else {
-            QString text;
-            while (!xml.atEnd()) {
-                xml.readNext();
-                if (xml.tokenType() == QXmlStreamReader::EndElement)
-                    break;
-                else if (xml.tokenType() == QXmlStreamReader::Characters)
-                    text.append(xml.text());
-            }
-
-            out << depthString() << "script: {" << endl;
-            foreach (QString line, text.split(QLatin1Char('\n'))) {
-                out << depthString() << line << endl;
-            }
-            out << depthString() << "}" << endl;
-            --depth;
-            out << depthString() << "}" << endl;
-        }
-        emptyLoop();
-    }
-
-    void startScript() {
-        if (xml.attributes().hasAttribute(QLatin1String("src"))) {
-            /*
-            QString import;
-            QTextStream ts(&import);
-            ts << "import \"";
-            ts << xml.attributes().value(QLatin1String("src")).toString();
-            ts << "\"" << endl;
-            ts.flush();
-            outString.prepend(import);
-            */
-        }
-        QString text = xml.readElementText();
-        if (!text.trimmed().isEmpty()) {
-            out << text << endl;
-        }
-        if (xml.tokenType() != QXmlStreamReader::EndElement)
-            emptyLoop();
-    }
-
-    void startList()
-    {
-        out << depthString() << xml.name().toString() << ": [" << endl;
-        ++depth;
-        bool needComma = false;
-
-        while (!xml.atEnd()) {
-            xml.readNext();
-            if (xml.tokenType() == QXmlStreamReader::EndElement)
-                break;
-            if (xml.tokenType() == QXmlStreamReader::StartElement) {
-                if (needComma)
-                    out << "," << endl;
-                startItem(true);
-                needComma = true;
-            }
-            comment();
-        }
-
-        out << endl;
-        --depth;
-        out << depthString() << "]" << endl;
-    }
-
-};
-
-
-
-int main(int argc, char *argv[])
-{
-    QCoreApplication a(argc, argv);
-
-    QStringList args = a.arguments();
-    args.removeFirst();
-
-    if (!args.isEmpty() && args.first() == QLatin1String("-i")) {
-        optionInPlace = true;
-        args.removeFirst();
-    }
-
-    if (args.isEmpty() && optionInPlace) {
-        qWarning() << "Usage: qmlconv [ [-i] filename ]";
-        exit(1);
-    }
-
-    const QString fileName = args.isEmpty() ? QString("-") : args.first();
-
-    QFile file(fileName);
-    if (fileName == "-") {
-        file.open(0,QIODevice::ReadOnly);
-    } else {
-        if (! file.open(QIODevice::ReadOnly)) {
-            qWarning() << "qmlconv: no input file";
-            exit(1);
-        }
-    }
-
-    Reader r(&file);
-    file.close();
-
-    if (optionInPlace) {
-        if (! file.open(QFile::WriteOnly)) {
-            qWarning() << "qmlconv: cannot open file" << qPrintable(fileName);
-            exit(1);
-        }
-
-        QTextStream out(&file);
-        out << r.output();
-        file.close();
-    }
-
-    return 0;
-}
diff --git a/tools/qmlconv/qmlconv.pro b/tools/qmlconv/qmlconv.pro
deleted file mode 100644
index 331f4ee..0000000
--- a/tools/qmlconv/qmlconv.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-DESTDIR = ../../bin
-QT -= gui
-# Input
-SOURCES += qmlconv.cpp
-
-target.path=$$[QT_INSTALL_BINS]
-INSTALLS += target
-
-CONFIG += console
-macx:CONFIG -= app_bundle
diff --git a/tools/qmlviewer/qmlviewer.cpp b/tools/qmlviewer/qmlviewer.cpp
index 93370d9..094d779 100644
--- a/tools/qmlviewer/qmlviewer.cpp
+++ b/tools/qmlviewer/qmlviewer.cpp
@@ -85,6 +85,14 @@ void QmlViewer::openQml(const QString& fileName)
             QmlComponent comp(canvas->engine());
             comp.setData(data, QUrl());
             QObject *dummyData = comp.create();
+
+            if(comp.isError()) {
+                QList<QmlError> errors = comp.errors();
+                foreach (const QmlError &error, errors) {
+                    qWarning() << error;
+                }
+            }
+
             if (dummyData) {
                 qWarning() << "Loaded dummy data:" << dir.filePath(qml);
                 qml.truncate(qml.length()-4);
diff --git a/tools/tools.pro b/tools/tools.pro
index 2c83580..2ff0214 100644
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -24,7 +24,7 @@ mac {
 
 SUBDIRS += kmap2qmap
 
-contains(QT_CONFIG, declarative):SUBDIRS += qmlviewer qmlconv
+contains(QT_CONFIG, declarative):SUBDIRS += qmlviewer 
 contains(QT_CONFIG, dbus):SUBDIRS += qdbus
 !wince*:contains(QT_CONFIG, xmlpatterns): SUBDIRS += xmlpatterns
 embedded: SUBDIRS += makeqpf