diff options
author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-02-16 14:43:03 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-24 04:51:31 +0100 |
commit | b855240b782395f94315f43ea3e7e182299fac48 (patch) | |
tree | bc594c04449be8cd14cd0ab0bb72dafc2be0ffb2 /src/quick/util/qdeclarativeutilmodule.cpp | |
parent | 6a42a6e0a9a1abdda0d07a5a20b4ac7e45348684 (diff) |
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 <martin.jones@nokia.com>
Diffstat (limited to 'src/quick/util/qdeclarativeutilmodule.cpp')
-rw-r--r-- | src/quick/util/qdeclarativeutilmodule.cpp | 103 |
1 files changed, 0 insertions, 103 deletions
diff --git a/src/quick/util/qdeclarativeutilmodule.cpp b/src/quick/util/qdeclarativeutilmodule.cpp deleted file mode 100644 index 02e4e9cf52..0000000000 --- a/src/quick/util/qdeclarativeutilmodule.cpp +++ /dev/null @@ -1,103 +0,0 @@ -/**************************************************************************** -** -** 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. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qdeclarativeutilmodule_p.h" -#include "qdeclarativeanimation_p.h" -#include "qdeclarativeanimation_p_p.h" -#include "qdeclarativebehavior_p.h" -#include "qdeclarativebind_p.h" -#include "qdeclarativeconnections_p.h" -#include "qdeclarativesmoothedanimation_p.h" -#include "qdeclarativefontloader_p.h" -#include "qdeclarativepackage_p.h" -#include "qdeclarativepropertychanges_p.h" -#include "qdeclarativespringanimation_p.h" -#include "qdeclarativestategroup_p.h" -#include "qdeclarativestateoperations_p.h" -#include "qdeclarativestate_p.h" -#include "qdeclarativestate_p_p.h" -#include "qdeclarativesystempalette_p.h" -#include "qdeclarativetimer_p.h" -#include "qdeclarativetransition_p.h" -#include <qdeclarativeinfo.h> -#include <private/qdeclarativetypenotavailable_p.h> -#include <private/qdeclarativeanimationcontroller_p.h> -#include <QtCore/qcoreapplication.h> -#include <QtGui/QInputMethod> - -void QDeclarativeUtilModule::defineModule() -{ - qmlRegisterUncreatableType<QInputMethod>("QtQuick",2,0,"InputPanel", - QInputMethod::tr("InputPanel is an abstract class")); // deprecated - qmlRegisterUncreatableType<QInputMethod>("QtQuick",2,0,"InputMethod", - QInputMethod::tr("InputMethod is an abstract class")); - qmlRegisterUncreatableType<QDeclarativeAbstractAnimation>("QtQuick",2,0,"Animation",QDeclarativeAbstractAnimation::tr("Animation is an abstract class")); - - qmlRegisterType<QDeclarativeBehavior>("QtQuick",2,0,"Behavior"); - qmlRegisterType<QDeclarativeBind>("QtQuick",2,0,"Binding"); - qmlRegisterType<QDeclarativeColorAnimation>("QtQuick",2,0,"ColorAnimation"); - qmlRegisterType<QDeclarativeConnections>("QtQuick",2,0,"Connections"); - qmlRegisterType<QDeclarativeSmoothedAnimation>("QtQuick",2,0,"SmoothedAnimation"); - qmlRegisterType<QDeclarativeFontLoader>("QtQuick",2,0,"FontLoader"); - qmlRegisterType<QDeclarativeNumberAnimation>("QtQuick",2,0,"NumberAnimation"); - qmlRegisterType<QDeclarativePackage>("QtQuick",2,0,"Package"); - qmlRegisterType<QDeclarativeParallelAnimation>("QtQuick",2,0,"ParallelAnimation"); - qmlRegisterType<QDeclarativePauseAnimation>("QtQuick",2,0,"PauseAnimation"); - qmlRegisterType<QDeclarativePropertyAction>("QtQuick",2,0,"PropertyAction"); - qmlRegisterType<QDeclarativePropertyAnimation>("QtQuick",2,0,"PropertyAnimation"); - qmlRegisterType<QDeclarativeRotationAnimation>("QtQuick",2,0,"RotationAnimation"); - qmlRegisterType<QDeclarativeScriptAction>("QtQuick",2,0,"ScriptAction"); - qmlRegisterType<QDeclarativeSequentialAnimation>("QtQuick",2,0,"SequentialAnimation"); - qmlRegisterType<QDeclarativeSpringAnimation>("QtQuick",2,0,"SpringAnimation"); - qmlRegisterType<QDeclarativeAnimationController>("QtQuick",2,0,"AnimationController"); - qmlRegisterType<QDeclarativeStateChangeScript>("QtQuick",2,0,"StateChangeScript"); - qmlRegisterType<QDeclarativeStateGroup>("QtQuick",2,0,"StateGroup"); - qmlRegisterType<QDeclarativeState>("QtQuick",2,0,"State"); - qmlRegisterType<QDeclarativeSystemPalette>("QtQuick",2,0,"SystemPalette"); - qmlRegisterType<QDeclarativeTimer>("QtQuick",2,0,"Timer"); - qmlRegisterType<QDeclarativeTransition>("QtQuick",2,0,"Transition"); - qmlRegisterType<QDeclarativeVector3dAnimation>("QtQuick",2,0,"Vector3dAnimation"); - - qmlRegisterType<QDeclarativeStateOperation>(); - - qmlRegisterCustomType<QDeclarativePropertyChanges>("QtQuick",2,0,"PropertyChanges", new QDeclarativePropertyChangesParser); - qmlRegisterCustomType<QDeclarativeConnections>("QtQuick",2,0,"Connections", new QDeclarativeConnectionsParser); -} |