Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Create a forwarding declarative module.
The declarative module has been replaced by the qml module. To allow existing projects which depend on the old declarative module to build, add a new declarative module which forwards dependencies on to the new qml module. This module contains only redefinitions of old symbol names to their new replacements, and creates forwarding headers that include the replacement headers provided by the qml module. This is a temporary change to prevent breaking existing projects that depend on the declarative module. After clients have had an opportunity to update their code to the use the new interfaces, it can be removed. Task-number: QTBUG-23737 Change-Id: I3cec5ceec4f9725c258e3672360a05ea87d3ca2f Reviewed-by: Martin Jones <martin.jones@nokia.com>
- Loading branch information
Matthew Vogt
authored and
Qt by Nokia
committed
Feb 27, 2012
1 parent
2849e61
commit 377eb94
Showing
4 changed files
with
411 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,192 @@ | ||
QT.declarative.VERSION = 5.0.0 | ||
QT.declarative.MAJOR_VERSION = 5 | ||
QT.declarative.MINOR_VERSION = 0 | ||
QT.declarative.PATCH_VERSION = 0 | ||
|
||
QT.declarative.name = QtDeclarative | ||
QT.declarative.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtDeclarative | ||
QT.declarative.private_includes = $$QT_MODULE_INCLUDE_BASE/QtDeclarative/$$QT.declarative.VERSION | ||
QT.declarative.sources = $$QT_MODULE_BASE/src/declarative | ||
QT.declarative.plugins = $$QT_MODULE_PLUGIN_BASE | ||
QT.declarative.imports = $$QT_MODULE_IMPORT_BASE | ||
QT.declarative.depends = gui network xmlpatterns | ||
QT.declarative.DEFINES = \ | ||
QDeclarativeAbstractAnimation=QQuickAbstractAnimation\ | ||
QDeclarativeAbstractBinding=QQmlAbstractBinding\ | ||
QDeclarativeAbstractBoundSignal=QQmlAbstractBoundSignal\ | ||
QDeclarativeAccessible=QQmlAccessible\ | ||
QDeclarativeAccessibleAttached=QQmlAccessibleAttached\ | ||
QDeclarativeAccessorProperties=QQmlAccessorProperties\ | ||
QDeclarativeAction=QQuickAction\ | ||
QDeclarativeActionEvent=QQuickActionEvent\ | ||
QDeclarativeAnimationGroup=QQuickAnimationGroup\ | ||
QDeclarativeAnimationPropertyUpdater=QQuickAnimationPropertyUpdater\ | ||
QDeclarativeApplication=QQuickApplication\ | ||
QDeclarativeBehavior=QQuickBehavior\ | ||
QDeclarativeBind=QQuickBind\ | ||
QDeclarativeBinding=QQmlBinding\ | ||
QDeclarativeBindingProfiler=QQmlBindingProfiler\ | ||
QDeclarativeBoundSignal=QQmlBoundSignal\ | ||
QDeclarativeBuiltinFunctions=QQmlBuiltinFunctions\ | ||
QDeclarativeBulkValueAnimator=QQuickBulkValueAnimator\ | ||
QDeclarativeChangeSet=QQuickChangeSet\ | ||
QDeclarativeCleanup=QQmlCleanup\ | ||
QDeclarativeColorAnimation=QQuickColorAnimation\ | ||
QDeclarativeColorValueType=QQmlColorValueType\ | ||
QDeclarativeCompiledData=QQmlCompiledData\ | ||
QDeclarativeCompiler=QQmlCompiler\ | ||
QDeclarativeCompilerTypes=QQmlCompilerTypes\ | ||
QDeclarativeComponent=QQmlComponent\ | ||
QDeclarativeComponentAttached=QQmlComponentAttached\ | ||
QDeclarativeComponentPrivate=QQmlComponentPrivate\ | ||
QDeclarativeConnections=QQuickConnections\ | ||
QDeclarativeContext=QQmlContext\ | ||
QDeclarativeContextData=QQmlContextData\ | ||
QDeclarativeCurve=QQuickCurve\ | ||
QDeclarativeCustomParser=QQmlCustomParser\ | ||
QDeclarativeCustomParserNode=QQmlCustomParserNode\ | ||
QDeclarativeCustomParserProperty=QQmlCustomParserProperty\ | ||
QDeclarativeData=QQmlData\ | ||
QDeclarativeDataBlob=QQmlDataBlob\ | ||
QDeclarativeDataLoader=QQmlDataLoader\ | ||
QDeclarativeDebug=QQmlDebug\ | ||
QDeclarativeDebugClient=QQmlDebugClient\ | ||
QDeclarativeDebugConnection=QQmlDebugConnection\ | ||
QDeclarativeDebugContextReference=QQmlDebugContextReference\ | ||
QDeclarativeDebugData=QQmlDebugData\ | ||
QDeclarativeDebugEngineReference=QQmlDebugEngineReference\ | ||
QDeclarativeDebugEnginesQuery=QQmlDebugEnginesQuery\ | ||
QDeclarativeDebugExpressionQuery=QQmlDebugExpressionQuery\ | ||
QDeclarativeDebugFileReference=QQmlDebugFileReference\ | ||
QDeclarativeDebuggingEnabler=QQmlDebuggingEnabler\ | ||
QDeclarativeDebugHelper=QQmlDebugHelper\ | ||
QDeclarativeDebugObjectExpressionWatch=QQmlDebugObjectExpressionWatch\ | ||
QDeclarativeDebugObjectQuery=QQmlDebugObjectQuery\ | ||
QDeclarativeDebugObjectReference=QQmlDebugObjectReference\ | ||
QDeclarativeDebugPropertyReference=QQmlDebugPropertyReference\ | ||
QDeclarativeDebugPropertyWatch=QQmlDebugPropertyWatch\ | ||
QDeclarativeDebugQuery=QQmlDebugQuery\ | ||
QDeclarativeDebugRootContextQuery=QQmlDebugRootContextQuery\ | ||
QDeclarativeDebugServer=QQmlDebugServer\ | ||
QDeclarativeDebugServerConnection=QQmlDebugServerConnection\ | ||
QDeclarativeDebugService=QQmlDebugService\ | ||
QDeclarativeDebugTrace=QQmlDebugTrace\ | ||
QDeclarativeDebugWatch=QQmlDebugWatch\ | ||
QDeclarativeEasingValueType=QQmlEasingValueType\ | ||
QDeclarativeEngine=QQmlEngine\ | ||
QDeclarativeEngineDebug=QQmlEngineDebug\ | ||
QDeclarativeEngineDebugService=QQmlEngineDebugService\ | ||
QDeclarativeEnginePrivate=QQmlEnginePrivate\ | ||
QDeclarativeError=QQmlError\ | ||
QDeclarativeExpression=QQmlExpression\ | ||
QDeclarativeExpressionPrivate=QQmlExpressionPrivate\ | ||
QDeclarativeExtensionInterface=QQmlExtensionInterface\ | ||
QDeclarativeExtensionPlugin=QQmlExtensionPlugin\ | ||
QDeclarativeFontLoader=QQuickFontLoader\ | ||
QDeclarativeFontValueType=QQmlFontValueType\ | ||
QDeclarativeGuard=QQmlGuard\ | ||
QDeclarativeImageProvider=QQmlImageProvider\ | ||
QDeclarativeImports=QQmlImports\ | ||
QDeclarativeIncubationController=QQmlIncubationController\ | ||
QDeclarativeIncubator=QQmlIncubator\ | ||
QDeclarativeInfo=QQmlInfo\ | ||
QDeclarativeInspector=QQmlInspector\ | ||
QDeclarativeInspectorInterface=QQmlInspectorInterface\ | ||
QDeclarativeInspectorService=QQmlInspectorService\ | ||
QDeclarativeInstruction=QQmlInstruction\ | ||
QDeclarativeJS=QQmlJS\ | ||
QDeclarativeListAccessor=QQuickListAccessor\ | ||
QDeclarativeListCompositor=QQuickListCompositor\ | ||
QDeclarativeListModel=QQuickListModel\ | ||
QDeclarativeListModelWorkerAgent=QQuickListModelWorkerAgent\ | ||
QDeclarativeListProperty=QQmlListProperty\ | ||
QDeclarativeListReference=QQmlListReference\ | ||
QDeclarativeLocale=QQmlLocale\ | ||
QDeclarativeMatrix4x4ValueType=QQmlMatrix4x4ValueType\ | ||
QDeclarativeMetaType=QQmlMetaType\ | ||
QDeclarativeNetworkAccessManagerFactory=QQmlNetworkAccessManagerFactory\ | ||
QDeclarativeNotifier=QQmlNotifier\ | ||
QDeclarativeNullableValue=QQmlNullableValue\ | ||
QDeclarativeNumberAnimation=QQuickNumberAnimation\ | ||
QDeclarativeOpenMetaObject=QQmlOpenMetaObject\ | ||
QDeclarativeOpenMetaObjectType=QQmlOpenMetaObjectType\ | ||
QDeclarativePackage=QQuickPackage\ | ||
QDeclarativeParser=QQmlParser\ | ||
QDeclarativeParserStatus=QQmlParserStatus\ | ||
QDeclarativePath=QQuickPath\ | ||
QDeclarativePathArc=QQuickPathArc\ | ||
QDeclarativePathAttribute=QQuickPathAttribute\ | ||
QDeclarativePathCatmullRomCurve=QQuickPathCatmullRomCurve\ | ||
QDeclarativePathCubic=QQuickPathCubic\ | ||
QDeclarativePathElement=QQuickPathElement\ | ||
QDeclarativePathInterpolator=QQuickPathInterpolator\ | ||
QDeclarativePathLine=QQuickPathLine\ | ||
QDeclarativePathPercent=QQuickPathPercent\ | ||
QDeclarativePathQuad=QQuickPathQuad\ | ||
QDeclarativePathSvg=QQuickPathSvg\ | ||
QDeclarativePauseAnimation=QQuickPauseAnimation\ | ||
QDeclarativePixmap=QQuickPixmap\ | ||
QDeclarativePointFValueType=QQmlPointFValueType\ | ||
QDeclarativePointValueType=QQmlPointValueType\ | ||
QDeclarativePool=QQmlPool\ | ||
QDeclarativePrivate=QQmlPrivate\ | ||
QDeclarativeProperty=QQmlProperty\ | ||
QDeclarativePropertyAnimation=QQuickPropertyAnimation\ | ||
QDeclarativePropertyCache=QQmlPropertyCache\ | ||
QDeclarativePropertyChanges=QQuickPropertyChanges\ | ||
QDeclarativePropertyMap=QQmlPropertyMap\ | ||
QDeclarativePropertyPrivate=QQmlPropertyPrivate\ | ||
QDeclarativePropertyValueInterceptor=QQmlPropertyValueInterceptor\ | ||
QDeclarativePropertyValueSource=QQmlPropertyValueSource\ | ||
QDeclarativeQmldirData=QQmlQmldirData\ | ||
QDeclarativeQtQuick1Module=QQmlQtQuick1Module\ | ||
QDeclarativeQtQuick2Module=QQmlQtQuick2Module\ | ||
QDeclarativeQuaternionValueType=QQmlQuaternionValueType\ | ||
QDeclarativeRectFValueType=QQmlRectFValueType\ | ||
QDeclarativeRectValueType=QQmlRectValueType\ | ||
QDeclarativeRewrite=QQmlRewrite\ | ||
QDeclarativeRotationAnimation=QQuickRotationAnimation\ | ||
QDeclarativeScript=QQmlScript\ | ||
QDeclarativeScriptAction=QQuickScriptAction\ | ||
QDeclarativeScriptBlob=QQmlScriptBlob\ | ||
QDeclarativeStringConverters=QQmlStringConverters\ | ||
QDeclarativeScriptData=QQmlScriptData\ | ||
QDeclarativeScriptString=QQmlScriptString\ | ||
QDeclarativeSizeFValueType=QQmlSizeFValueType\ | ||
QDeclarativeSizeValueType=QQmlSizeValueType\ | ||
QDeclarativeSmoothedAnimation=QQuickSmoothedAnimation\ | ||
QDeclarativeSpringAnimation=QQuickSpringAnimation\ | ||
QDeclarativeState=QQuickState\ | ||
QDeclarativeStateChangeScript=QQuickStateChangeScript\ | ||
QDeclarativeStateGroup=QQuickStateGroup\ | ||
QDeclarativeStateOperation=QQuickStateOperation\ | ||
QDeclarativeStyledText=QQuickStyledText\ | ||
QDeclarativeStyledTextImgTag=QQuickStyledTextImgTag\ | ||
QDeclarativeSvgParser=QQmlSvgParser\ | ||
QDeclarativeSystemPalette=QQuickSystemPalette\ | ||
QDeclarativeTextureFactory=QQuickTextureFactory\ | ||
QDeclarativeTimeLine=QQuickTimeLine\ | ||
QDeclarativeTimeLineCallback=QQuickTimeLineCallback\ | ||
QDeclarativeTimeLineObject=QQuickTimeLineObject\ | ||
QDeclarativeTimeLineValue=QQuickTimeLineValue\ | ||
QDeclarativeTimer=QQuickTimer\ | ||
QDeclarativeTransition=QQuickTransition\ | ||
QDeclarativeTransitionManager=QQuickTransitionManager\ | ||
QDeclarativeType=QQmlType\ | ||
QDeclarativeTypeData=QQmlTypeData\ | ||
QDeclarativeTypeLoader=QQmlTypeLoader\ | ||
QDeclarativeTypesExtensionInterface=QQmlTypesExtensionInterface\ | ||
QDeclarativeV8Function=QQmlV8Function\ | ||
QDeclarativeValueType=QQmlValueType\ | ||
QDeclarativeValueTypeFactory=QQmlValueTypeFactory\ | ||
QDeclarativeVector2DValueType=QQmlVector2DValueType\ | ||
QDeclarativeVector3dAnimation=QQuickVector3dAnimation\ | ||
QDeclarativeVector3DValueType=QQmlVector3DValueType\ | ||
QDeclarativeVector4DValueType=QQmlVector4DValueType\ | ||
QDeclarativeVME=QQmlVME\ | ||
QDeclarativeVMEMetaObject=QQmlVMEMetaObject\ | ||
QDeclarativeVMETypes=QQmlVMETypes\ | ||
QDeclarativeWorkerScript=QQuickWorkerScript\ | ||
QDeclarativeXmlListModel=QQuickXmlListModel | ||
|
||
QT_CONFIG += declarative |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
TARGET = QtDeclarative | ||
TEMPLATE = subdirs | ||
|
||
MODULE_PRI = ../../modules/qt_declarative.pri | ||
|
||
QT = qml | ||
|
||
pritarget.path = $$[QT_INSTALL_DATA]/mkspecs/modules | ||
pritarget.files = $$MODULE_PRI | ||
INSTALLS += pritarget | ||
|
||
#load up the headers info | ||
CONFIG += qt_install_headers | ||
HEADERS_PRI = ../../include/QtDeclarative/headers.pri | ||
include($$HEADERS_PRI, "", true)|clear(HEADERS_PRI) | ||
|
||
INSTALL_HEADERS = $$SYNCQT.HEADER_FILES | ||
|
||
flat_headers.files = $$INSTALL_HEADERS | ||
flat_headers.path = $$[QT_INSTALL_HEADERS]/Qt | ||
INSTALLS += flat_headers | ||
|
||
class_headers.path = $$[QT_INSTALL_HEADERS]/$$TARGET | ||
class_headers.files = $$SYNCQT.HEADER_CLASSES | ||
INSTALLS += class_headers | ||
|
||
targ_headers.files = $$INSTALL_HEADERS | ||
targ_headers.path = $$[QT_INSTALL_HEADERS]/$$TARGET | ||
INSTALLS += targ_headers | ||
|
||
private_headers.files = $$SYNCQT.PRIVATE_HEADER_FILES | ||
private_headers.path = $$[QT_INSTALL_HEADERS]/$$TARGET/$${QT.declarative.VERSION}/$$TARGET/private | ||
INSTALLS += private_headers |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.