Merge remote branch 'origin/2.0'

Conflicts:
	doc/qt-html-templates.qdocconf
	src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
	src/plugins/qmljseditor/qmljscodecompletion.cpp

src/libs/qmljs/qmljsdocument.h

@@ -93,6 +93,7 @@ public:
 
 private:
     bool parse_helper(int kind);
+    static void extractPragmas(QString *source);
 
 private:
     QmlJS::Engine *_engine;