diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-03-03 15:01:04 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-03 17:39:15 +0100 |
| commit | 5a06bc73822576cb9ffceb243f43f6b28fd6b4dc (patch) | |
| tree | 6cc922f3a2fd0fd6be4d3e6273d0f603efd158e0 /src/qml/qml/qqmlobjectcreator.cpp | |
| parent | 307bdba9c3c068ac7e7ded291bbd1b34054af42b (diff) | |
Work around MSVC having issues with nested classes and templates
Move SharedState into its own top-level structure.
Change-Id: I0b6baeade57ff342df23672808d77933fa6ad26d
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlobjectcreator.cpp')
| -rw-r--r-- | src/qml/qml/qqmlobjectcreator.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlobjectcreator.cpp b/src/qml/qml/qqmlobjectcreator.cpp index e14d30effb..ff75e587ef 100644 --- a/src/qml/qml/qqmlobjectcreator.cpp +++ b/src/qml/qml/qqmlobjectcreator.cpp @@ -88,7 +88,7 @@ QQmlObjectCreator::QQmlObjectCreator(QQmlContextData *parentContext, QQmlCompile { init(parentContext); - sharedState = new SharedState; + sharedState = new QQmlObjectCreatorSharedState; sharedState.setFlag(); // We own it, so we must delete it sharedState->componentAttached = 0; sharedState->allCreatedBindings.allocate(compiledData->totalBindingsCount); @@ -97,7 +97,7 @@ QQmlObjectCreator::QQmlObjectCreator(QQmlContextData *parentContext, QQmlCompile sharedState->rootContext = 0; } -QQmlObjectCreator::QQmlObjectCreator(QQmlContextData *parentContext, QQmlCompiledData *compiledData, SharedState *inheritedSharedState) +QQmlObjectCreator::QQmlObjectCreator(QQmlContextData *parentContext, QQmlCompiledData *compiledData, QQmlObjectCreatorSharedState *inheritedSharedState) : compiledData(compiledData) , resolvedTypes(compiledData->resolvedTypes) , propertyCaches(compiledData->propertyCaches) |