summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJędrzej Nowacki <jedrzej.nowacki@nokia.com>2012-01-06 12:17:30 +0100
committerQt by Nokia <qt-info@nokia.com>2012-01-10 01:27:04 +0100
commitae9afa6b9ebcdbaef5e0fea5091aab1a667fa3ac (patch)
treef5e3e66bce75f13eef882823e82cb8a1282a43f5 /src
parent64a735eed688e4dbf52aa3caf4caea53c4c211ec (diff)
Remove wrong assert from QMetaType.
We can't assert that QMetaType helper arrays are initialized. In rare situations it may happen that QMetaType compiled without support for an external type (without compiled Gui or Widgets libraries) will be asked for additional information for the type. For example (assuming Qt is compiled with --no-gui): // typeId it may be received over network (QMetaType::QImage) void *ptr = QMetaType::create(typeId); Change-Id: I018a59b23def35c7574e7c921019b5db4f06e800 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src')
-rw-r--r--src/corelib/kernel/qmetatype.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp
index 7132a099a2..112dfe92e6 100644
--- a/src/corelib/kernel/qmetatype.cpp
+++ b/src/corelib/kernel/qmetatype.cpp
@@ -1435,12 +1435,10 @@ class TypeConstructor {
{
QMetaType::Constructor ctor = 0;
if (QTypeModuleInfo<T>::IsGui) {
- Q_ASSERT(qMetaTypeGuiHelper);
if (!qMetaTypeGuiHelper)
return 0;
ctor = qMetaTypeGuiHelper[type - QMetaType::FirstGuiType].constructor;
} else if (QTypeModuleInfo<T>::IsWidget) {
- Q_ASSERT(qMetaTypeWidgetsHelper);
if (!qMetaTypeWidgetsHelper)
return 0;
ctor = qMetaTypeWidgetsHelper[type - QMetaType::FirstWidgetsType].constructor;
@@ -1527,12 +1525,10 @@ class TypeDestructor {
{
QMetaType::Destructor dtor = 0;
if (QTypeModuleInfo<T>::IsGui) {
- Q_ASSERT(qMetaTypeGuiHelper);
if (!qMetaTypeGuiHelper)
return;
dtor = qMetaTypeGuiHelper[type - QMetaType::FirstGuiType].destructor;
} else if (QTypeModuleInfo<T>::IsWidget) {
- Q_ASSERT(qMetaTypeWidgetsHelper);
if (!qMetaTypeWidgetsHelper)
return;
dtor = qMetaTypeWidgetsHelper[type - QMetaType::FirstWidgetsType].destructor;
@@ -1601,12 +1597,10 @@ class SizeOf {
static int Size(const int type)
{
if (QTypeModuleInfo<T>::IsGui) {
- Q_ASSERT(qMetaTypeGuiHelper);
if (!qMetaTypeGuiHelper)
return 0;
return qMetaTypeGuiHelper[type - QMetaType::FirstGuiType].size;
} else if (QTypeModuleInfo<T>::IsWidget) {
- Q_ASSERT(qMetaTypeWidgetsHelper);
if (!qMetaTypeWidgetsHelper)
return 0;
return qMetaTypeWidgetsHelper[type - QMetaType::FirstWidgetsType].size;