summaryrefslogtreecommitdiffstats
path: root/src/runtime/q3dsuippresentation_p.h
diff options
context:
space:
mode:
authorChristian Strømme <christian.stromme@qt.io>2018-09-21 10:33:54 +0200
committerChristian Strømme <christian.stromme@qt.io>2018-09-21 10:34:42 +0200
commit9091098014c4cdfbc122bbc015b7641b07f28205 (patch)
tree034af6f3991a538814c55c6636c570b2efbf7fbb /src/runtime/q3dsuippresentation_p.h
parent59923f7725c82ac31c1245a36bd3b1be9bec3cd7 (diff)
parent95942f6b187c5272074c191424a18e33f8516967 (diff)
Merge remote-tracking branch 'origin/2.1'
Diffstat (limited to 'src/runtime/q3dsuippresentation_p.h')
-rw-r--r--src/runtime/q3dsuippresentation_p.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/runtime/q3dsuippresentation_p.h b/src/runtime/q3dsuippresentation_p.h
index 822cf5f..601d1ab 100644
--- a/src/runtime/q3dsuippresentation_p.h
+++ b/src/runtime/q3dsuippresentation_p.h
@@ -582,11 +582,11 @@ public:
};
QString name;
- Q3DS::PropertyType type = Q3DS::Unknown;
+ Q3DS::PropertyType type = Q3DS::Unknown; // may be unspecified in which case it remains Unknown
Type argType = Unknown;
QString value;
- bool isValid() const { return type != Q3DS::Unknown; }
+ bool isValid() const { return !name.isEmpty() || !value.isEmpty(); }
};
Q3DSGraphObject *owner = nullptr;