diff options
| author | Christian Kandeler <[email protected]> | 2017-08-17 11:31:31 +0200 |
|---|---|---|
| committer | Christian Kandeler <[email protected]> | 2017-08-17 09:53:39 +0000 |
| commit | a4aa79a4f8da10256e923bca8fa4403436ea64dc (patch) | |
| tree | 3b801ecb0094a0a9a8a9a90139e2f91cc26ca5f4 /src/libs/qmljs/qmljsmodelmanagerinterface.h | |
| parent | ef1b0f999df0c7e817f30f1d80406b1d4471c6a6 (diff) | |
QmlJS: Rename variable called "interface"
Easily conflicts with a macro of the same name in windows.h.
Change-Id: Ia6dfb294092497c48816e71ff901e9c3b2c8359f
Reviewed-by: Ulf Hermann <[email protected]>
Diffstat (limited to 'src/libs/qmljs/qmljsmodelmanagerinterface.h')
| -rw-r--r-- | src/libs/qmljs/qmljsmodelmanagerinterface.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libs/qmljs/qmljsmodelmanagerinterface.h b/src/libs/qmljs/qmljsmodelmanagerinterface.h index 98174de4f95..c86177d4879 100644 --- a/src/libs/qmljs/qmljsmodelmanagerinterface.h +++ b/src/libs/qmljs/qmljsmodelmanagerinterface.h @@ -242,7 +242,7 @@ protected: ModelManagerInterface *modelManager, QmlJS::Dialect mainLanguage, bool emitDocChangedOnDisk); - static void updateCppQmlTypes(QFutureInterface<void> &interface, + static void updateCppQmlTypes(QFutureInterface<void> &futureInterface, ModelManagerInterface *qmlModelManager, CPlusPlus::Snapshot snapshot, QHash<QString, QPair<CPlusPlus::Document::Ptr, bool> > documents); |