diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2011-12-01 11:11:43 +0000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-01 15:05:14 +0100 |
commit | 413bbeb9358cc1c908c97158ad82154b7fdf6b20 (patch) | |
tree | c89dc0e0a3f66d2bc2c24fc961a01664c0e05b0b /src | |
parent | 3a5bbbe499fdf3014f4bce6faabfb34bd38b3da8 (diff) |
Move QDeclarativePropertyValueInterceptor into a private header
This should never have been public.
Change-Id: I77811413c93fdc7767d0921e12284e9a8bc88752
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/declarative/qml/qdeclarative.h | 3 | ||||
-rw-r--r-- | src/declarative/qml/qdeclarativepropertyvalueinterceptor.cpp | 2 | ||||
-rw-r--r-- | src/declarative/qml/qdeclarativepropertyvalueinterceptor_p.h (renamed from src/declarative/qml/qdeclarativepropertyvalueinterceptor.h) | 23 | ||||
-rw-r--r-- | src/declarative/qml/qdeclarativevme.cpp | 1 | ||||
-rw-r--r-- | src/declarative/qml/qdeclarativevmemetaobject.cpp | 2 | ||||
-rw-r--r-- | src/declarative/qml/qml.pri | 2 | ||||
-rw-r--r-- | src/declarative/util/qdeclarativebehavior_p.h | 2 | ||||
-rw-r--r-- | src/qtquick1/util/qdeclarativebehavior_p.h | 2 |
8 files changed, 23 insertions, 14 deletions
diff --git a/src/declarative/qml/qdeclarative.h b/src/declarative/qml/qdeclarative.h index b98899be0e..4babb76510 100644 --- a/src/declarative/qml/qdeclarative.h +++ b/src/declarative/qml/qdeclarative.h @@ -45,7 +45,6 @@ #include <QtDeclarative/qdeclarativeprivate.h> #include <QtDeclarative/qdeclarativeparserstatus.h> #include <QtDeclarative/qdeclarativepropertyvaluesource.h> -#include <QtDeclarative/qdeclarativepropertyvalueinterceptor.h> #include <QtDeclarative/qdeclarativelist.h> #include <QtCore/qbytearray.h> @@ -89,6 +88,8 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) +class QDeclarativePropertyValueInterceptor; + template<typename T> int qmlRegisterType() { diff --git a/src/declarative/qml/qdeclarativepropertyvalueinterceptor.cpp b/src/declarative/qml/qdeclarativepropertyvalueinterceptor.cpp index 325be0fd7f..39b1aedd12 100644 --- a/src/declarative/qml/qdeclarativepropertyvalueinterceptor.cpp +++ b/src/declarative/qml/qdeclarativepropertyvalueinterceptor.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qdeclarativepropertyvalueinterceptor.h" +#include "qdeclarativepropertyvalueinterceptor_p.h" #include "qdeclarative.h" diff --git a/src/declarative/qml/qdeclarativepropertyvalueinterceptor.h b/src/declarative/qml/qdeclarativepropertyvalueinterceptor_p.h index 95d653f59d..7f99f958a6 100644 --- a/src/declarative/qml/qdeclarativepropertyvalueinterceptor.h +++ b/src/declarative/qml/qdeclarativepropertyvalueinterceptor_p.h @@ -39,17 +39,24 @@ ** ****************************************************************************/ -#ifndef QDECLARATIVEPROPERTYVALUEINTERCEPTOR_H -#define QDECLARATIVEPROPERTYVALUEINTERCEPTOR_H +#ifndef QDECLARATIVEPROPERTYVALUEINTERCEPTOR_P_H +#define QDECLARATIVEPROPERTYVALUEINTERCEPTOR_P_H -#include <QtCore/qobject.h> +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// -QT_BEGIN_HEADER +#include <QtCore/qobject.h> QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QDeclarativeProperty; class Q_DECLARATIVE_EXPORT QDeclarativePropertyValueInterceptor { @@ -63,6 +70,4 @@ Q_DECLARE_INTERFACE(QDeclarativePropertyValueInterceptor, "com.trolltech.qml.QDe QT_END_NAMESPACE -QT_END_HEADER - -#endif // QDECLARATIVEPROPERTYVALUEINTERCEPTOR_H +#endif // QDECLARATIVEPROPERTYVALUEINTERCEPTOR_P_H diff --git a/src/declarative/qml/qdeclarativevme.cpp b/src/declarative/qml/qdeclarativevme.cpp index a6fc8ba661..327a0ae6c0 100644 --- a/src/declarative/qml/qdeclarativevme.cpp +++ b/src/declarative/qml/qdeclarativevme.cpp @@ -64,6 +64,7 @@ #include <private/qfinitestack_p.h> #include "qdeclarativescriptstring.h" #include "qdeclarativescriptstring_p.h" +#include "qdeclarativepropertyvalueinterceptor_p.h" #include <QStack> #include <QColor> diff --git a/src/declarative/qml/qdeclarativevmemetaobject.cpp b/src/declarative/qml/qdeclarativevmemetaobject.cpp index f768d8c1ae..229a93b961 100644 --- a/src/declarative/qml/qdeclarativevmemetaobject.cpp +++ b/src/declarative/qml/qdeclarativevmemetaobject.cpp @@ -41,12 +41,14 @@ #include "qdeclarativevmemetaobject_p.h" + #include "qdeclarative.h" #include <private/qdeclarativerefcount_p.h> #include "qdeclarativeexpression.h" #include "qdeclarativeexpression_p.h" #include "qdeclarativecontext_p.h" #include "qdeclarativebinding_p.h" +#include "qdeclarativepropertyvalueinterceptor_p.h" Q_DECLARE_METATYPE(QJSValue); diff --git a/src/declarative/qml/qml.pri b/src/declarative/qml/qml.pri index 928854ad62..8508e24e10 100644 --- a/src/declarative/qml/qml.pri +++ b/src/declarative/qml/qml.pri @@ -70,7 +70,7 @@ HEADERS += \ $$PWD/qdeclarativecustomparser_p.h \ $$PWD/qdeclarativecustomparser_p_p.h \ $$PWD/qdeclarativepropertyvaluesource.h \ - $$PWD/qdeclarativepropertyvalueinterceptor.h \ + $$PWD/qdeclarativepropertyvalueinterceptor_p.h \ $$PWD/qdeclarativeboundsignal_p.h \ $$PWD/qdeclarativeparserstatus.h \ $$PWD/qdeclarativeproxymetaobject_p.h \ diff --git a/src/declarative/util/qdeclarativebehavior_p.h b/src/declarative/util/qdeclarativebehavior_p.h index 3918d34f54..613461abb1 100644 --- a/src/declarative/util/qdeclarativebehavior_p.h +++ b/src/declarative/util/qdeclarativebehavior_p.h @@ -44,7 +44,7 @@ #include <private/qdeclarativeglobal_p.h> -#include <qdeclarativepropertyvalueinterceptor.h> +#include <private/qdeclarativepropertyvalueinterceptor_p.h> #include <qdeclarative.h> #include <QtCore/QAbstractAnimation> diff --git a/src/qtquick1/util/qdeclarativebehavior_p.h b/src/qtquick1/util/qdeclarativebehavior_p.h index cc026ef82d..f7d34f8605 100644 --- a/src/qtquick1/util/qdeclarativebehavior_p.h +++ b/src/qtquick1/util/qdeclarativebehavior_p.h @@ -45,7 +45,7 @@ #include "QtQuick1/private/qdeclarativestate_p.h" #include <QtDeclarative/qdeclarativepropertyvaluesource.h> -#include <QtDeclarative/qdeclarativepropertyvalueinterceptor.h> +#include <private/qdeclarativepropertyvalueinterceptor_p.h> #include <QtDeclarative/qdeclarative.h> #include <QtCore/QAbstractAnimation> |