summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2010-04-29 09:04:09 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2010-04-29 09:05:00 (GMT)
commite1a60c82d39af5bda99ebea12f6877d6cd9642ac (patch)
tree51bb681a34b11a84f25cef364de344cbceda46ed /src
parent4c47079d367d44cf18b91965c351a5e9d834b343 (diff)
downloadQt-e1a60c82d39af5bda99ebea12f6877d6cd9642ac.zip
Qt-e1a60c82d39af5bda99ebea12f6877d6cd9642ac.tar.gz
Qt-e1a60c82d39af5bda99ebea12f6877d6cd9642ac.tar.bz2
Cleanup guards used in synthesized QML meta objects
QTCREATORBUG-1289
Diffstat (limited to 'src')
-rw-r--r--src/declarative/qml/qdeclarativevmemetaobject.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/declarative/qml/qdeclarativevmemetaobject.cpp b/src/declarative/qml/qdeclarativevmemetaobject.cpp
index 45f04a0..13e9c26 100644
--- a/src/declarative/qml/qdeclarativevmemetaobject.cpp
+++ b/src/declarative/qml/qdeclarativevmemetaobject.cpp
@@ -106,8 +106,7 @@ QDeclarativeVMEVariant::~QDeclarativeVMEVariant()
void QDeclarativeVMEVariant::cleanup()
{
if (type == QVariant::Invalid) {
- } else if (type == QMetaType::QObjectStar ||
- type == QMetaType::Int ||
+ } else if (type == QMetaType::Int ||
type == QMetaType::Bool ||
type == QMetaType::Double) {
type = QVariant::Invalid;