Attachment #198626 for bug #278247

Lines 45-50 Link Here

(-)a/generator/parser/rpp/pp-internal.h (+2 lines)
45		45
46	#include <algorithm>	46	#include <algorithm>
47		47
		48	#include <cstdio>
		49
48	namespace rpp {	50	namespace rpp {
49		51
50	namespace _PP_internal	52	namespace _PP_internal

Lines 709-714 Link Here

(-)a/generator/typesystem_core-common.xml (+4 lines)
709	<include file-name="QStringList" location="global"/>	709	<include file-name="QStringList" location="global"/>
710	</extra-includes>	710	</extra-includes>
711	<modify-function signature="operator=(QRegExp)" remove="all"/>	711	<modify-function signature="operator=(QRegExp)" remove="all"/>
		712	<modify-function signature="pos(int)const"> <remove/> </modify-function>
		713	<modify-function signature="cap(int)const"> <remove/> </modify-function>
		714	<modify-function signature="capturedTexts()const"> <remove/> </modify-function>
		715	<modify-function signature="errorString()const"> <remove/> </modify-function>
712	</value-type>	716	</value-type>
713		717
714	<value-type name="QFileInfo">	718	<value-type name="QFileInfo">

Lines 1425-1430 Link Here

(-)a/generator/typesystem_gui-common.xml (+2 lines)
1425	<modify-function signature="exec()" access="non-final"/>	1425	<modify-function signature="exec()" access="non-final"/>
1426	<modify-function signature="extension()const" remove="all"/> <!--### Obsolete in 4.3-->	1426	<modify-function signature="extension()const" remove="all"/> <!--### Obsolete in 4.3-->
1427	<modify-function signature="orientation()const" remove="all"/> <!--### Obsolete in 4.3-->	1427	<modify-function signature="orientation()const" remove="all"/> <!--### Obsolete in 4.3-->
		1428	<modify-function signature="open()" access="non-final"/>
		1429	<modify-function signature="accepted()" access="non-final"/>
1428	<modify-function signature="setOrientation(Qt::Orientation)" remove="all"/> <!--### Obsolete in 4.3-->	1430	<modify-function signature="setOrientation(Qt::Orientation)" remove="all"/> <!--### Obsolete in 4.3-->
1429	<modify-function signature="showExtension(bool)" remove="all"/> <!--### Obsolete in 4.3-->	1431	<modify-function signature="showExtension(bool)" remove="all"/> <!--### Obsolete in 4.3-->
1430	</object-type>	1432	</object-type>

Lines 132-137 Link Here

(-)a/generator/typesystem_xml-common.xml (+3 lines)
132	<modify-function signature="value(const QLatin1String &)const">	132	<modify-function signature="value(const QLatin1String &)const">
133	<remove />	133	<remove />
134	</modify-function>	134	</modify-function>
		135	<modify-function signature="hasAttribute(const QLatin1String &)const">
		136	<remove />
		137	</modify-function>
135	</value-type>	138	</value-type>
136		139
137	<value-type name="QXmlStreamNamespaceDeclaration">	140	<value-type name="QXmlStreamNamespaceDeclaration">

Lines 42-47 Link Here

(-)a/juic/javautils.cpp (+2 lines)
42	#include "javautils.h"	42	#include "javautils.h"
43	#include <QtCore/QHash>	43	#include <QtCore/QHash>
44		44
		45	#include <cstdio>
		46
45	QString javaFixString(const QString &str)	47	QString javaFixString(const QString &str)
46	{	48	{
47	const ushort *chars = str.utf16();	49	const ushort *chars = str.utf16();





    int extra_data_count = extra_data != 0 ? env->GetArrayLength(extra_data) : 0;
    if (extra_data_count > 0) {
        const QMetaObject **ptr = new const QMetaObject *[extra_data_count];
        q->d.extradata = ptr;
        Q_ASSERT(q->d.extradata != 0);

        for (int i=0; i<extra_data_count; ++i)
            ptr[i] = qtjambi_metaobject_for_class(env, reinterpret_cast<jclass>(env->GetObjectArrayElement(extra_data, i)), 0);
    }



Return to bug 278247

Lines 180-190 void QtDynamicMetaObjectPrivate::initialize(JNIEnv *env, jclass java_class, cons Link Here

(-)a/qtjambi/qtdynamicmetaobject.cpp (-2 / +3 lines)
180		180
181	int extra_data_count = extra_data != 0 ? env->GetArrayLength(extra_data) : 0;	181	int extra_data_count = extra_data != 0 ? env->GetArrayLength(extra_data) : 0;
182	if (extra_data_count > 0) {	182	if (extra_data_count > 0) {
183	q->d.extradata = new const QMetaObject *[extra_data_count];	183	const QMetaObject *ptr = new const QMetaObject [extra_data_count];
		184	q->d.extradata = ptr;
184	Q_ASSERT(q->d.extradata != 0);	185	Q_ASSERT(q->d.extradata != 0);
185		186
186	for (int i=0; i<extra_data_count; ++i)	187	for (int i=0; i<extra_data_count; ++i)
187	q->d.extradata[i] = qtjambi_metaobject_for_class(env, reinterpret_cast<jclass>(env->GetObjectArrayElement(extra_data, i)), 0);	188	ptr[i] = qtjambi_metaobject_for_class(env, reinterpret_cast<jclass>(env->GetObjectArrayElement(extra_data, i)), 0);
188	}	189	}
189		190
190		191