From b855240b782395f94315f43ea3e7e182299fac48 Mon Sep 17 00:00:00 2001 From: Matthew Vogt Date: Thu, 16 Feb 2012 14:43:03 +1000 Subject: Rename QDeclarative symbols to QQuick and QQml Symbols beginning with QDeclarative are already exported by the quick1 module. Users can apply the bin/rename-qtdeclarative-symbols.sh script to modify client code using the previous names of the renamed symbols. Task-number: QTBUG-23737 Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66 Reviewed-by: Martin Jones --- src/quick/designer/designersupport.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/quick/designer/designersupport.h') diff --git a/src/quick/designer/designersupport.h b/src/quick/designer/designersupport.h index e80a537859..a31c8c3d46 100644 --- a/src/quick/designer/designersupport.h +++ b/src/quick/designer/designersupport.h @@ -3,7 +3,7 @@ ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/ ** -** This file is part of the QtDeclarative module of the Qt Toolkit. +** This file is part of the QtQml module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage @@ -67,7 +67,7 @@ class QQuickItem; class QQuickShaderEffectTexture; class QImage; class QTransform; -class QDeclarativeContext; +class QQmlContext; class QQuickView; @@ -122,7 +122,7 @@ public: static bool hasAnchor(QQuickItem *item, const QString &name); static QQuickItem *anchorFillTargetItem(QQuickItem *item); static QQuickItem *anchorCenterInTargetItem(QQuickItem *item); - static QPair anchorLineTarget(QQuickItem *item, const QString &name, QDeclarativeContext *context); + static QPair anchorLineTarget(QQuickItem *item, const QString &name, QQmlContext *context); static void resetAnchor(QQuickItem *item, const QString &name); @@ -132,7 +132,7 @@ public: static int borderWidth(QQuickItem *item); - static void refreshExpressions(QDeclarativeContext *context); + static void refreshExpressions(QQmlContext *context); static void setRootItem(QQuickView *view, QQuickItem *item); -- cgit v1.2.3