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

qmldump: Make Creator able to read qmldump's new output.

Browse Source 
Task-number: QTCREATORBUG-3048
This commit is contained in:
Christian Kamm
2011-02-08 11:01:37 +01:00
parent bffe90b2f4
commit dd1de1b82f
11 changed files with 577 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libs/qmljs/qmljsinterpreter.cpp
View File

@@ -1945,7 +1945,7 @@ const Value *Function::invoke(const Activation *activation) const
QList<FakeMetaObject::ConstPtr> CppQmlTypesLoader::builtinObjects;
QStringList CppQmlTypesLoader::load(const QFileInfoList &xmlFiles)
QStringList CppQmlTypesLoader::loadXml(const QFileInfoList &xmlFiles)
{
QMap<QString, FakeMetaObject::Ptr> newObjects;
QStringList errorMsgs;
@@ -2117,10 +2117,10 @@ bool CppQmlTypes::hasPackage(const QString &package) const
QString CppQmlTypes::qualifiedName(const QString &package, const QString &type, ComponentVersion version)
{
return QString("%1.%2 %3.%4").arg(
return QString("%1.%2 %3").arg(
package, type,
QString::number(version.majorVersion()),
QString::number(version.minorVersion()));
version.toString());
}
QmlObjectValue *CppQmlTypes::typeByQualifiedName(const QString &name) const