Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt

Conflicts:
	mkspecs/linux-g++-x11egl/qplatformdefs.h
	src/declarative/qml/qmldom.h
	src/declarative/util/qmlview.cpp
	src/declarative/util/qmlview.h
	tools/qdoc3/cppcodemarker.cpp
	tools/qmldebugger/standalone/canvasframerate.cpp
	tools/qmldebugger/standalone/engine.cpp
	tools/qmldebugger/standalone/expressionquerywidget.cpp
	tools/qmldebugger/standalone/expressionquerywidget.h
	tools/qmldebugger/standalone/objectpropertiesview.cpp
	tools/qmldebugger/standalone/objectpropertiesview.h
	tools/qmldebugger/standalone/objecttree.cpp
	tools/qmldebugger/standalone/qmldebugger.cpp
	tools/qmldebugger/standalone/watchtable.cpp
	tools/qmldebugger/standalone/watchtable.h

1 files changed, 5 insertions, 0 deletions

diff --git a/tools/qdoc3/codeparser.cpp b/tools/qdoc3/codeparser.cpp
index 3ad3372..5ae63ac 100644
--- a/tools/qdoc3/codeparser.cpp
+++ b/tools/qdoc3/codeparser.cpp
@@ -59,6 +59,7 @@ QT_BEGIN_NAMESPACE
 #define COMMAND_MAINCLASS               Doc::alias(QLatin1String("mainclass"))
 #define COMMAND_NONREENTRANT            Doc::alias(QLatin1String("nonreentrant"))
 #define COMMAND_OBSOLETE                Doc::alias(QLatin1String("obsolete"))
+#define COMMAND_PAGEKEYWORDS            Doc::alias(QLatin1String("pagekeywords"))
 #define COMMAND_PRELIMINARY             Doc::alias(QLatin1String("preliminary"))
 #define COMMAND_INPUBLICGROUP           Doc::alias(QLatin1String("inpublicgroup"))
 #define COMMAND_REENTRANT               Doc::alias(QLatin1String("reentrant"))
@@ -170,6 +171,7 @@ QSet<QString> CodeParser::commonMetaCommands()
                            << COMMAND_MAINCLASS
                            << COMMAND_NONREENTRANT
                            << COMMAND_OBSOLETE
+                           << COMMAND_PAGEKEYWORDS
                            << COMMAND_PRELIMINARY
                            << COMMAND_INPUBLICGROUP
                            << COMMAND_REENTRANT
@@ -230,6 +232,9 @@ void CodeParser::processCommonMetaCommand(const Location &location,
     else if (command == COMMAND_SINCE) {
         node->setSince(arg);
     }
+    else if (command == COMMAND_PAGEKEYWORDS) {
+        node->addPageKeywords(arg);
+    }
     else if (command == COMMAND_SUBTITLE) {
 	if (node->type() == Node::Fake) {
 	    FakeNode *fake = static_cast<FakeNode *>(node);