diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-06-08 23:24:14 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-06-08 23:24:14 (GMT) |
| commit | 9410eb0630e0f3b80ffd335002efbd7ce532e826 (patch) | |
| tree | af445ec1d7cfdcb9e9c74c58214b0d8d57bd7575 /src/tools | |
| parent | f64ef46fdb49c609a434ad92ce01ee40116d6545 (diff) | |
| download | Qt-9410eb0630e0f3b80ffd335002efbd7ce532e826.zip Qt-9410eb0630e0f3b80ffd335002efbd7ce532e826.tar.gz Qt-9410eb0630e0f3b80ffd335002efbd7ce532e826.tar.bz2 | |
Revert "Naively fix handling of qreal properties for ARM."
This reverts commit 2575eac4c26ad92dde95959a82f576edc3e76e1d.
Conflicts:
src/declarative/qml/qmlvme.cpp
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/moc/generator.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp index b6bd1ad..ca1311b 100644 --- a/src/tools/moc/generator.cpp +++ b/src/tools/moc/generator.cpp @@ -758,9 +758,6 @@ void Generator::generateMetacall() else if (cdef->enumDeclarations.value(p.type, false)) fprintf(out, " case %d: *reinterpret_cast<int*>(_v) = QFlag(%s()); break;\n", propindex, p.read.constData()); - else if (p.type == "qreal") - fprintf(out, " case %d: *reinterpret_cast< double*>(_v) = %s(); break;\n", - propindex, p.read.constData()); else fprintf(out, " case %d: *reinterpret_cast< %s*>(_v) = %s(); break;\n", propindex, p.type.constData(), p.read.constData()); @@ -785,9 +782,6 @@ void Generator::generateMetacall() if (cdef->enumDeclarations.value(p.type, false)) { fprintf(out, " case %d: %s(QFlag(*reinterpret_cast<int*>(_v))); break;\n", propindex, p.write.constData()); - } else if(p.type == "qreal") { - fprintf(out, " case %d: %s(*reinterpret_cast< double*>(_v)); break;\n", - propindex, p.write.constData()); } else { fprintf(out, " case %d: %s(*reinterpret_cast< %s*>(_v)); break;\n", propindex, p.write.constData(), p.type.constData()); |