summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2009-10-28 04:03:26 (GMT)
committerMartin Jones <martin.jones@nokia.com>2009-10-28 04:03:26 (GMT)
commit072b70c9521d507b0a4cdae379f2874d0e49d6df (patch)
treea25dbeaf90932e00725f0e6528180177861f4b1e
parentfc5050497e207abda676d79dc7694f5635bf0f11 (diff)
downloadQt-072b70c9521d507b0a4cdae379f2874d0e49d6df.zip
Qt-072b70c9521d507b0a4cdae379f2874d0e49d6df.tar.gz
Qt-072b70c9521d507b0a4cdae379f2874d0e49d6df.tar.bz2
Use QML_DECLARE_TYPEINFO attached properties detection on all platforms.
-rw-r--r--src/declarative/qml/qmlprivate.h32
1 files changed, 0 insertions, 32 deletions
diff --git a/src/declarative/qml/qmlprivate.h b/src/declarative/qml/qmlprivate.h
index 3e1a7e0..1b57f03 100644
--- a/src/declarative/qml/qmlprivate.h
+++ b/src/declarative/qml/qmlprivate.h
@@ -132,43 +132,11 @@ namespace QmlPrivate
}
};
-#if defined(Q_CC_MSVC)
- template <typename T>
- class has_attachedPropertiesMember
- {
- public:
- __if_exists(T::qmlAttachedProperties) {
- static bool const value = true;
- }
- __if_not_exists(T::qmlAttachedProperties) {
- static bool const value = false;
- }
- };
-#elif defined(Q_OS_SYMBIAN)
template <typename T>
struct has_attachedPropertiesMember
{
static bool const value = QmlTypeInfo<T>::hasAttachedProperties;
};
-#else
- template <typename T>
- class has_attachedPropertiesMember
- {
- typedef int yes_type;
- typedef char no_type;
- template <int>
- struct Selector {};
-
- template <typename S>
- static yes_type test(Selector<sizeof(&S::qmlAttachedProperties)>*);
-
- template <typename S>
- static no_type test(...);
-
- public:
- static bool const value = sizeof(test<T>(0)) == sizeof(yes_type);
- };
-#endif
template <typename T, bool hasMember>
class has_attachedPropertiesMethod