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

QmlJS: Fix potential linking problem.

Browse Source 
Don't use plugin from libs/qmljs.

Change-Id: Ia345c567cd1f244ab2191017810ef3eeb91fe0e4
Reviewed-on: http://codereview.qt.nokia.com/213
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
This commit is contained in:
Christian Kamm
2011-05-30 12:56:24 +02:00
parent 060ca8d1cb
commit 83072da8b0
3 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -615,9 +615,10 @@ class QMLJS_EXPORT CppQmlTypesLoader
{
public:
/** Loads a set of qmltypes files into the builtin objects list
and prints any errors to the General Messages pane
and returns errors and warnings
*/
static void loadQmlTypes(const QFileInfoList &qmltypesFiles);
static void loadQmlTypes(const QFileInfoList &qmltypesFiles,
QStringList *errors, QStringList *warnings);
static QHash<QString, LanguageUtils::FakeMetaObject::ConstPtr> builtinObjects;
static QHash<QString, QList<LanguageUtils::ComponentVersion> > builtinPackages;