From 19acafe924be012df7c3b1cd456baab1c922e1b4 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 23 Feb 2017 16:44:04 +0100 Subject: cppgenerator.cpp: Remove generation of Qt 4.7 version check Change-Id: I8fbca647cc287e3762e54f4d9071b9a31fac376c Reviewed-by: Alexandru Croitor --- generator/shiboken2/cppgenerator.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/generator/shiboken2/cppgenerator.cpp b/generator/shiboken2/cppgenerator.cpp index 67ebfe0..1e44e7b 100644 --- a/generator/shiboken2/cppgenerator.cpp +++ b/generator/shiboken2/cppgenerator.cpp @@ -865,9 +865,8 @@ void CppGenerator::writeMetaObjectMethod(QTextStream& s, const AbstractMetaClass QString wrapperClassName = wrapperName(metaClass); s << "const QMetaObject* " << wrapperClassName << "::metaObject() const" << endl; s << '{' << endl; - s << INDENT << "#if QT_VERSION >= 0x040700" << endl; - s << INDENT << "if (QObject::d_ptr->metaObject) return QObject::d_ptr->dynamicMetaObject();" << endl; - s << INDENT << "#endif" << endl; + s << INDENT << "if (QObject::d_ptr->metaObject)" << endl + << INDENT << INDENT << "return QObject::d_ptr->dynamicMetaObject();" << endl; s << INDENT << "SbkObject* pySelf = Shiboken::BindingManager::instance().retrieveWrapper(this);" << endl; s << INDENT << "if (pySelf == NULL)" << endl; s << INDENT << INDENT << "return " << metaClass->qualifiedCppName() << "::metaObject();" << endl; -- cgit v1.2.3