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

QmlJS: Find setContextProperty calls in C++ and expose to QML.

Browse Source 
Task-number: QTCREATORBUG-3199

Change-Id: I591490ceafadc0f5a07c63ec063f1bdfa7055f47
Reviewed-on: http://codereview.qt-project.org/4074
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
This commit is contained in:
Christian Kamm
2011-08-25 12:35:55 +02:00
parent c2f31f16dc
commit 10a956a8f7
8 changed files with 327 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/qmljstools/qmljsmodelmanager.h
View File

@@ -91,7 +91,7 @@ public:
virtual void loadPluginTypes(const QString &libraryPath, const QString &importPath,
const QString &importUri, const QString &importVersion);
virtual CppQmlTypeHash cppQmlTypes() const;
virtual CppDataHash cppData() const;
virtual QmlJS::LibraryInfo builtins(const QmlJS::Document::Ptr &doc) const;
@@ -140,8 +140,9 @@ private:
QTimer *m_updateCppQmlTypesTimer;
QMap<QString, QPair<CPlusPlus::Document::Ptr, bool> > m_queuedCppDocuments;
CppQmlTypeHash m_cppTypes;
mutable QMutex m_cppTypesMutex;
CppDataHash m_cppDataHash;
mutable QMutex m_cppDataMutex;
// project integration
QMap<ProjectExplorer::Project *, ProjectInfo> m_projects;