diff options
Diffstat (limited to 'src/declarative/qml/qdeclarativevaluetype.cpp')
-rw-r--r-- | src/declarative/qml/qdeclarativevaluetype.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/declarative/qml/qdeclarativevaluetype.cpp b/src/declarative/qml/qdeclarativevaluetype.cpp index c18ea9d8..6a0eac98 100644 --- a/src/declarative/qml/qdeclarativevaluetype.cpp +++ b/src/declarative/qml/qdeclarativevaluetype.cpp @@ -44,6 +44,7 @@ #include "private/qdeclarativemetatype_p.h" #include "private/qfont_p.h" +#include <QtWidgets/qapplication.h> #include <QtCore/qdebug.h> QT_BEGIN_NAMESPACE @@ -106,10 +107,15 @@ void QDeclarativeValueTypeFactory::registerValueTypes() { qmlRegisterValueTypeEnums<QDeclarativeEasingValueType>("QtQuick",1,0,"Easing"); qmlRegisterValueTypeEnums<QDeclarativeFontValueType>("QtQuick",1,0,"Font"); -#ifndef QT_NO_IMPORT_QT47_QML +} + +void QDeclarativeValueTypeFactory::registerValueTypesCompat() +{ + if (QApplication::type() == QApplication::Tty) + return; + qmlRegisterValueTypeEnums<QDeclarativeEasingValueType>("Qt",4,7,"Easing"); qmlRegisterValueTypeEnums<QDeclarativeFontValueType>("Qt",4,7,"Font"); -#endif } QDeclarativeValueType *QDeclarativeValueTypeFactory::valueType(int t) |