diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-04-09 06:37:48 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-04-09 06:37:48 (GMT) |
| commit | da8dda3a3b66fed6d5da878f3b4617aa0b5f3953 (patch) | |
| tree | 120401a37b5364f3fde52bcb599c3c005e9d526a /src/declarative/qml/qdeclarativeobjectscriptclass_p.h | |
| parent | 44efb487bbd2a9e4de416d566839cdffff1d69e2 (diff) | |
| download | Qt-da8dda3a3b66fed6d5da878f3b4617aa0b5f3953.zip Qt-da8dda3a3b66fed6d5da878f3b4617aa0b5f3953.tar.gz Qt-da8dda3a3b66fed6d5da878f3b4617aa0b5f3953.tar.bz2 | |
Remove QT_VERSION checks in QML
We only support Qt 4.7 now.
Diffstat (limited to 'src/declarative/qml/qdeclarativeobjectscriptclass_p.h')
| -rw-r--r-- | src/declarative/qml/qdeclarativeobjectscriptclass_p.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/declarative/qml/qdeclarativeobjectscriptclass_p.h b/src/declarative/qml/qdeclarativeobjectscriptclass_p.h index 5a59ef8..4b27e53 100644 --- a/src/declarative/qml/qdeclarativeobjectscriptclass_p.h +++ b/src/declarative/qml/qdeclarativeobjectscriptclass_p.h @@ -66,7 +66,6 @@ class QScriptContext; class QScriptEngine; class QDeclarativeContextData; -#if (QT_VERSION > QT_VERSION_CHECK(4, 6, 2)) || defined(QT_HAVE_QSCRIPTDECLARATIVECLASS_VALUE) class Q_AUTOTEST_EXPORT QDeclarativeObjectMethodScriptClass : public QScriptDeclarativeClass { public: @@ -91,7 +90,6 @@ private: QDeclarativeEngine *engine; }; -#endif class Q_AUTOTEST_EXPORT QDeclarativeObjectScriptClass : public QScriptDeclarativeClass { @@ -132,10 +130,8 @@ protected: virtual QObject *toQObject(Object *, bool *ok = 0); private: -#if (QT_VERSION > QT_VERSION_CHECK(4, 6, 2)) || defined(QT_HAVE_QSCRIPTDECLARATIVECLASS_VALUE) friend class QDeclarativeObjectMethodScriptClass; QDeclarativeObjectMethodScriptClass methods; -#endif QDeclarativeTypeNameCache::Data *lastTNData; QDeclarativePropertyCache::Data *lastData; |