summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2010-01-11 03:20:12 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2010-01-11 03:20:12 (GMT)
commit8585ba96eddafaeefea8ca493c6a6d1bf9635cfc (patch)
tree86176f4abe35706f47b4269e336b52e88522e56b
parentb6a7d7cc9c4eaab53213d0116e4f1d5cbd267004 (diff)
downloadQt-8585ba96eddafaeefea8ca493c6a6d1bf9635cfc.zip
Qt-8585ba96eddafaeefea8ca493c6a6d1bf9635cfc.tar.gz
Qt-8585ba96eddafaeefea8ca493c6a6d1bf9635cfc.tar.bz2
Compile with QT_NO_CURSOR.
-rw-r--r--src/declarative/qml/qmlmetatype.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/declarative/qml/qmlmetatype.cpp b/src/declarative/qml/qmlmetatype.cpp
index 0b79a21..d9c007d 100644
--- a/src/declarative/qml/qmlmetatype.cpp
+++ b/src/declarative/qml/qmlmetatype.cpp
@@ -1102,9 +1102,11 @@ bool QmlMetaType::copy(int type, void *data, const void *copy)
case QMetaType::QBitmap:
*static_cast<NS(QBitmap) *>(data) = *static_cast<const NS(QBitmap)*>(copy);
return true;
+#ifndef QT_NO_CURSOR
case QMetaType::QCursor:
*static_cast<NS(QCursor) *>(data) = *static_cast<const NS(QCursor)*>(copy);
return true;
+#endif
case QMetaType::QSizePolicy:
*static_cast<NS(QSizePolicy) *>(data) = *static_cast<const NS(QSizePolicy)*>(copy);
return true;
@@ -1308,9 +1310,11 @@ bool QmlMetaType::copy(int type, void *data, const void *copy)
case QMetaType::QBitmap:
*static_cast<NS(QBitmap) *>(data) = NS(QBitmap)();
return true;
+#ifndef QT_NO_CURSOR
case QMetaType::QCursor:
*static_cast<NS(QCursor) *>(data) = NS(QCursor)();
return true;
+#endif
case QMetaType::QSizePolicy:
*static_cast<NS(QSizePolicy) *>(data) = NS(QSizePolicy)();
return true;