feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlJS: Output qmltypes parse warnings to General messages pane.

Browse Source 
Change-Id: I8ca100ef141082c7606bb98f8a2f81502b14e1af
Reviewed-on: http://codereview.qt.nokia.com/204
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
This commit is contained in:
Christian Kamm
2011-05-30 11:10:06 +02:00
committed by Kai Koehne
parent ec97fc95a0
commit f0a4e7e225
6 changed files with 103 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/libs/qmljs/qmljsinterpreter.h
View File

@@ -614,15 +614,19 @@ private:
class QMLJS_EXPORT CppQmlTypesLoader
{
public:
/** \return an empty list when successful, error messages otherwise. */
static QStringList loadQmlTypes(const QFileInfoList &xmlFiles);
/** Loads a set of qmltypes files into the builtin objects list
and prints any errors to the General Messages pane
*/
static void loadQmlTypes(const QFileInfoList &qmltypesFiles);
static QHash<QString, LanguageUtils::FakeMetaObject::ConstPtr> builtinObjects;
static QHash<QString, QList<LanguageUtils::ComponentVersion> > builtinPackages;
// parses the xml string and fills the newObjects map
static QString parseQmlTypeDescriptions(const QByteArray &xml,
QHash<QString, LanguageUtils::FakeMetaObject::ConstPtr> *newObjects);
// parses the contents of a qmltypes file and fills the newObjects map
static void parseQmlTypeDescriptions(
const QByteArray &qmlTypes,
QHash<QString, LanguageUtils::FakeMetaObject::ConstPtr> *newObjects,
QString *errorMessage, QString *warningMessage);
};
class QMLJS_EXPORT CppQmlTypes