[SCM] qtdeclarative packaging branch, ubuntu+1, updated. debian/5.6.0-rc-1-54-ga7e19d5
Timo Jyrinki
timo at moszumanska.debian.org
Wed Mar 9 14:29:01 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtdeclarative.git;a=commitdiff;h=a7e19d5
The following commit has been merged in the ubuntu+1 branch:
commit a7e19d5b4be8b7ecbde1793a37116653966c0b99
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date: Wed Mar 9 14:27:57 2016 +0000
Refresh QML cache and test binary location patches to apply.
---
debian/changelog | 1 +
...-Compilation-unit-caching-and-JIT-changes.patch | 229 +++++++++++----------
debian/patches/fix_binary_location_for_tests.patch | 68 +++---
3 files changed, 153 insertions(+), 145 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4c9bb5b..7959d1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ qtdeclarative-opensource-src (5.6.0~rc-1ubuntu1) UNRELEASED; urgency=medium
- QQuickItem-fix-an-infinite-loop-nextItemInFocusChain.patch
- WIP-QQuickItem-fix-another-infinite-loop-in-nextItem.patch
- qmlplugindump-Don-t-try-to-import-Qt.test.qtestroot.patch
+ * Refresh QML cache and test binary location patches to apply.
-- Timo Jyrinki <timo-jyrinki at ubuntu.com> Tue, 26 Jan 2016 10:07:50 +0000
diff --git a/debian/patches/QML-Compilation-unit-caching-and-JIT-changes.patch b/debian/patches/QML-Compilation-unit-caching-and-JIT-changes.patch
index 015d67d..527c31c 100644
--- a/debian/patches/QML-Compilation-unit-caching-and-JIT-changes.patch
+++ b/debian/patches/QML-Compilation-unit-caching-and-JIT-changes.patch
@@ -10,10 +10,10 @@ Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/qtdeclarative-opensource-s
Forwarded: No
Last-Update: 2015-02-25
-Index: qtdeclarative-opensource-src-5.4.0/src/3rdparty/masm/assembler/ARMv7Assembler.h
+Index: qtdeclarative-opensource-src-5.6.0-rc/src/3rdparty/masm/assembler/ARMv7Assembler.h
===================================================================
---- qtdeclarative-opensource-src-5.4.0.orig/src/3rdparty/masm/assembler/ARMv7Assembler.h
-+++ qtdeclarative-opensource-src-5.4.0/src/3rdparty/masm/assembler/ARMv7Assembler.h
+--- qtdeclarative-opensource-src-5.6.0-rc.orig/src/3rdparty/masm/assembler/ARMv7Assembler.h
++++ qtdeclarative-opensource-src-5.6.0-rc/src/3rdparty/masm/assembler/ARMv7Assembler.h
@@ -445,6 +445,12 @@ public:
ConditionInvalid
} Condition;
@@ -35,10 +35,10 @@ Index: qtdeclarative-opensource-src-5.4.0/src/3rdparty/masm/assembler/ARMv7Assem
unsigned debugOffset() { return m_buffer.debugOffset(); }
-Index: qtdeclarative-opensource-src-5.4.0/src/3rdparty/masm/assembler/AbstractMacroAssembler.h
+Index: qtdeclarative-opensource-src-5.6.0-rc/src/3rdparty/masm/assembler/AbstractMacroAssembler.h
===================================================================
---- qtdeclarative-opensource-src-5.4.0.orig/src/3rdparty/masm/assembler/AbstractMacroAssembler.h
-+++ qtdeclarative-opensource-src-5.4.0/src/3rdparty/masm/assembler/AbstractMacroAssembler.h
+--- qtdeclarative-opensource-src-5.6.0-rc.orig/src/3rdparty/masm/assembler/AbstractMacroAssembler.h
++++ qtdeclarative-opensource-src-5.6.0-rc/src/3rdparty/masm/assembler/AbstractMacroAssembler.h
@@ -486,6 +486,11 @@ public:
return Call(jump.m_label, Linkable);
}
@@ -64,10 +64,10 @@ Index: qtdeclarative-opensource-src-5.4.0/src/3rdparty/masm/assembler/AbstractMa
protected:
AbstractMacroAssembler()
: m_randomSource(cryptographicallyRandomNumber())
-Index: qtdeclarative-opensource-src-5.4.0/src/3rdparty/masm/assembler/AssemblerBuffer.h
+Index: qtdeclarative-opensource-src-5.6.0-rc/src/3rdparty/masm/assembler/AssemblerBuffer.h
===================================================================
---- qtdeclarative-opensource-src-5.4.0.orig/src/3rdparty/masm/assembler/AssemblerBuffer.h
-+++ qtdeclarative-opensource-src-5.4.0/src/3rdparty/masm/assembler/AssemblerBuffer.h
+--- qtdeclarative-opensource-src-5.6.0-rc.orig/src/3rdparty/masm/assembler/AssemblerBuffer.h
++++ qtdeclarative-opensource-src-5.6.0-rc/src/3rdparty/masm/assembler/AssemblerBuffer.h
@@ -86,6 +86,14 @@ namespace JSC {
grow();
}
@@ -83,10 +83,10 @@ Index: qtdeclarative-opensource-src-5.4.0/src/3rdparty/masm/assembler/AssemblerB
bool isAligned(int alignment) const
{
return !(m_index & (alignment - 1));
-Index: qtdeclarative-opensource-src-5.4.0/src/3rdparty/masm/assembler/LinkBuffer.h
+Index: qtdeclarative-opensource-src-5.6.0-rc/src/3rdparty/masm/assembler/LinkBuffer.h
===================================================================
---- qtdeclarative-opensource-src-5.4.0.orig/src/3rdparty/masm/assembler/LinkBuffer.h
-+++ qtdeclarative-opensource-src-5.4.0/src/3rdparty/masm/assembler/LinkBuffer.h
+--- qtdeclarative-opensource-src-5.6.0-rc.orig/src/3rdparty/masm/assembler/LinkBuffer.h
++++ qtdeclarative-opensource-src-5.6.0-rc/src/3rdparty/masm/assembler/LinkBuffer.h
@@ -109,11 +109,13 @@ public:
// These methods are used to link or set values at code generation time.
@@ -102,10 +102,10 @@ Index: qtdeclarative-opensource-src-5.4.0/src/3rdparty/masm/assembler/LinkBuffer
}
void link(Jump jump, CodeLocationLabel label)
-Index: qtdeclarative-opensource-src-5.4.0/src/3rdparty/masm/assembler/X86Assembler.h
+Index: qtdeclarative-opensource-src-5.6.0-rc/src/3rdparty/masm/assembler/X86Assembler.h
===================================================================
---- qtdeclarative-opensource-src-5.4.0.orig/src/3rdparty/masm/assembler/X86Assembler.h
-+++ qtdeclarative-opensource-src-5.4.0/src/3rdparty/masm/assembler/X86Assembler.h
+--- qtdeclarative-opensource-src-5.6.0-rc.orig/src/3rdparty/masm/assembler/X86Assembler.h
++++ qtdeclarative-opensource-src-5.6.0-rc/src/3rdparty/masm/assembler/X86Assembler.h
@@ -101,6 +101,11 @@ public:
ConditionNC = ConditionAE,
} Condition;
@@ -126,10 +126,10 @@ Index: qtdeclarative-opensource-src-5.4.0/src/3rdparty/masm/assembler/X86Assembl
PassRefPtr<ExecutableMemoryHandle> executableCopy(JSGlobalData& globalData, void* ownerUID, JITCompilationEffort effort)
{
-Index: qtdeclarative-opensource-src-5.4.0/src/qml/compiler/compiler.pri
+Index: qtdeclarative-opensource-src-5.6.0-rc/src/qml/compiler/compiler.pri
===================================================================
---- qtdeclarative-opensource-src-5.4.0.orig/src/qml/compiler/compiler.pri
-+++ qtdeclarative-opensource-src-5.4.0/src/qml/compiler/compiler.pri
+--- qtdeclarative-opensource-src-5.6.0-rc.orig/src/qml/compiler/compiler.pri
++++ qtdeclarative-opensource-src-5.6.0-rc/src/qml/compiler/compiler.pri
@@ -28,10 +28,10 @@ HEADERS += \
$$PWD/qv4isel_moth_p.h \
$$PWD/qv4instr_moth_p.h
@@ -142,11 +142,11 @@ Index: qtdeclarative-opensource-src-5.4.0/src/qml/compiler/compiler.pri
+DEFINES += V4_UNIT_CACHE
}
-Index: qtdeclarative-opensource-src-5.4.0/src/qml/compiler/qqmlirbuilder.cpp
+Index: qtdeclarative-opensource-src-5.6.0-rc/src/qml/compiler/qqmlirbuilder.cpp
===================================================================
---- qtdeclarative-opensource-src-5.4.0.orig/src/qml/compiler/qqmlirbuilder.cpp
-+++ qtdeclarative-opensource-src-5.4.0/src/qml/compiler/qqmlirbuilder.cpp
-@@ -1502,7 +1502,12 @@ bool IRBuilder::isStatementNodeScript(QQ
+--- qtdeclarative-opensource-src-5.6.0-rc.orig/src/qml/compiler/qqmlirbuilder.cpp
++++ qtdeclarative-opensource-src-5.6.0-rc/src/qml/compiler/qqmlirbuilder.cpp
+@@ -1296,7 +1296,12 @@ bool IRBuilder::isStatementNodeScript(QQ
QV4::CompiledData::Unit *QmlUnitGenerator::generate(Document &output)
{
QQmlRefPointer<QV4::CompiledData::CompilationUnit> compilationUnit = output.javaScriptCompilationUnit;
@@ -160,7 +160,7 @@ Index: qtdeclarative-opensource-src-5.4.0/src/qml/compiler/qqmlirbuilder.cpp
const uint unitSize = jsUnit->unitSize;
const int importSize = sizeof(QV4::CompiledData::Import) * output.imports.count();
-@@ -1527,7 +1532,6 @@ QV4::CompiledData::Unit *QmlUnitGenerato
+@@ -1322,7 +1327,6 @@ QV4::CompiledData::Unit *QmlUnitGenerato
memset(data + unitSize, 0, totalSize - unitSize);
if (jsUnit != compilationUnit->data)
free(jsUnit);
@@ -168,7 +168,7 @@ Index: qtdeclarative-opensource-src-5.4.0/src/qml/compiler/qqmlirbuilder.cpp
QV4::CompiledData::Unit *qmlUnit = reinterpret_cast<QV4::CompiledData::Unit *>(data);
qmlUnit->unitSize = totalSize;
-@@ -1538,8 +1542,22 @@ QV4::CompiledData::Unit *QmlUnitGenerato
+@@ -1333,8 +1337,22 @@ QV4::CompiledData::Unit *QmlUnitGenerato
qmlUnit->offsetToObjects = unitSize + importSize;
qmlUnit->nObjects = output.objects.count();
qmlUnit->indexOfRootObject = output.indexOfRootObject;
@@ -191,7 +191,7 @@ Index: qtdeclarative-opensource-src-5.4.0/src/qml/compiler/qqmlirbuilder.cpp
// write imports
char *importPtr = data + qmlUnit->offsetToImports;
-@@ -1631,7 +1649,12 @@ QV4::CompiledData::Unit *QmlUnitGenerato
+@@ -1426,7 +1444,12 @@ QV4::CompiledData::Unit *QmlUnitGenerato
}
}
@@ -204,11 +204,11 @@ Index: qtdeclarative-opensource-src-5.4.0/src/qml/compiler/qqmlirbuilder.cpp
return qmlUnit;
}
-Index: qtdeclarative-opensource-src-5.4.0/src/qml/compiler/qqmltypecompiler.cpp
+Index: qtdeclarative-opensource-src-5.6.0-rc/src/qml/compiler/qqmltypecompiler.cpp
===================================================================
---- qtdeclarative-opensource-src-5.4.0.orig/src/qml/compiler/qqmltypecompiler.cpp
-+++ qtdeclarative-opensource-src-5.4.0/src/qml/compiler/qqmltypecompiler.cpp
-@@ -219,6 +219,7 @@ bool QQmlTypeCompiler::compile()
+--- qtdeclarative-opensource-src-5.6.0-rc.orig/src/qml/compiler/qqmltypecompiler.cpp
++++ qtdeclarative-opensource-src-5.6.0-rc/src/qml/compiler/qqmltypecompiler.cpp
+@@ -218,6 +218,7 @@ bool QQmlTypeCompiler::compile()
QScopedPointer<QV4::EvalInstructionSelection> isel(v4->iselFactory->create(engine, v4->executableAllocator, &document->jsModule, &document->jsGenerator));
isel->setUseFastLookups(false);
isel->setUseTypeInference(true);
@@ -216,7 +216,7 @@ Index: qtdeclarative-opensource-src-5.4.0/src/qml/compiler/qqmltypecompiler.cpp
document->javaScriptCompilationUnit = isel->compile(/*generated unit data*/false);
}
-@@ -419,6 +420,7 @@ QQmlPropertyCacheCreator::QQmlPropertyCa
+@@ -423,6 +424,7 @@ QQmlPropertyCacheCreator::QQmlPropertyCa
, qmlObjects(*typeCompiler->qmlObjects())
, imports(typeCompiler->imports())
, resolvedTypes(typeCompiler->resolvedTypes())
@@ -224,11 +224,11 @@ Index: qtdeclarative-opensource-src-5.4.0/src/qml/compiler/qqmltypecompiler.cpp
{
}
-Index: qtdeclarative-opensource-src-5.4.0/src/qml/compiler/qqmltypecompiler_p.h
+Index: qtdeclarative-opensource-src-5.6.0-rc/src/qml/compiler/qqmltypecompiler_p.h
===================================================================
---- qtdeclarative-opensource-src-5.4.0.orig/src/qml/compiler/qqmltypecompiler_p.h
-+++ qtdeclarative-opensource-src-5.4.0/src/qml/compiler/qqmltypecompiler_p.h
-@@ -140,6 +140,7 @@ protected:
+--- qtdeclarative-opensource-src-5.6.0-rc.orig/src/qml/compiler/qqmltypecompiler_p.h
++++ qtdeclarative-opensource-src-5.6.0-rc/src/qml/compiler/qqmltypecompiler_p.h
+@@ -152,6 +152,7 @@ protected:
QHash<int, QQmlCompiledData::TypeReference*> *resolvedTypes;
QVector<QByteArray> vmeMetaObjects;
QVector<QQmlPropertyCache*> propertyCaches;
@@ -236,11 +236,11 @@ Index: qtdeclarative-opensource-src-5.4.0/src/qml/compiler/qqmltypecompiler_p.h
};
// "Converts" signal expressions to full-fleged function declarations with
-Index: qtdeclarative-opensource-src-5.4.0/src/qml/compiler/qv4compileddata_p.h
+Index: qtdeclarative-opensource-src-5.6.0-rc/src/qml/compiler/qv4compileddata_p.h
===================================================================
---- qtdeclarative-opensource-src-5.4.0.orig/src/qml/compiler/qv4compileddata_p.h
-+++ qtdeclarative-opensource-src-5.4.0/src/qml/compiler/qv4compileddata_p.h
-@@ -594,6 +594,11 @@ struct Q_QML_PRIVATE_EXPORT CompilationU
+--- qtdeclarative-opensource-src-5.6.0-rc.orig/src/qml/compiler/qv4compileddata_p.h
++++ qtdeclarative-opensource-src-5.6.0-rc/src/qml/compiler/qv4compileddata_p.h
+@@ -608,6 +608,11 @@ struct Q_QML_PRIVATE_EXPORT CompilationU
QVector<QV4::Function *> runtimeFunctions;
mutable QQmlNullableValue<QUrl> m_url;
@@ -252,11 +252,11 @@ Index: qtdeclarative-opensource-src-5.4.0/src/qml/compiler/qv4compileddata_p.h
// index is object index. This allows fast access to the
// property data when initializing bindings, avoiding expensive
// lookups by string (property name).
-Index: qtdeclarative-opensource-src-5.4.0/src/qml/compiler/qv4isel_moth_p.h
+Index: qtdeclarative-opensource-src-5.6.0-rc/src/qml/compiler/qv4isel_moth_p.h
===================================================================
---- qtdeclarative-opensource-src-5.4.0.orig/src/qml/compiler/qv4isel_moth_p.h
-+++ qtdeclarative-opensource-src-5.4.0/src/qml/compiler/qv4isel_moth_p.h
-@@ -64,9 +64,11 @@ public:
+--- qtdeclarative-opensource-src-5.6.0-rc.orig/src/qml/compiler/qv4isel_moth_p.h
++++ qtdeclarative-opensource-src-5.6.0-rc/src/qml/compiler/qv4isel_moth_p.h
+@@ -75,9 +75,11 @@ public:
~InstructionSelection();
virtual void run(int functionIndex);
@@ -268,10 +268,10 @@ Index: qtdeclarative-opensource-src-5.4.0/src/qml/compiler/qv4isel_moth_p.h
virtual void visitJump(IR::Jump *);
virtual void visitCJump(IR::CJump *);
-Index: qtdeclarative-opensource-src-5.4.0/src/qml/compiler/qv4isel_p.cpp
+Index: qtdeclarative-opensource-src-5.6.0-rc/src/qml/compiler/qv4isel_p.cpp
===================================================================
---- qtdeclarative-opensource-src-5.4.0.orig/src/qml/compiler/qv4isel_p.cpp
-+++ qtdeclarative-opensource-src-5.4.0/src/qml/compiler/qv4isel_p.cpp
+--- qtdeclarative-opensource-src-5.6.0-rc.orig/src/qml/compiler/qv4isel_p.cpp
++++ qtdeclarative-opensource-src-5.6.0-rc/src/qml/compiler/qv4isel_p.cpp
@@ -3,6 +3,12 @@
** Copyright (C) 2015 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/
@@ -285,11 +285,12 @@ Index: qtdeclarative-opensource-src-5.4.0/src/qml/compiler/qv4isel_p.cpp
** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL21$
-@@ -41,9 +47,65 @@
+@@ -42,10 +48,66 @@
+ #endif
#include <QString>
+#include <QDataStream>
-
++
+#ifndef V4_UNIT_CACHE
+#undef ENABLE_UNIT_CACHE
+#endif
@@ -336,7 +337,7 @@ Index: qtdeclarative-opensource-src-5.4.0/src/qml/compiler/qv4isel_p.cpp
+ return true;
+ }
+}
-+
+
using namespace QV4;
using namespace QV4::IR;
@@ -351,7 +352,7 @@ Index: qtdeclarative-opensource-src-5.4.0/src/qml/compiler/qv4isel_p.cpp
EvalInstructionSelection::EvalInstructionSelection(QV4::ExecutableAllocator *execAllocator, Module *module, QV4::Compiler::JSUnitGenerator *jsGenerator)
: useFastLookups(true)
, useTypeInference(true)
-@@ -64,6 +126,9 @@ EvalInstructionSelection::EvalInstructio
+@@ -61,6 +123,9 @@ EvalInstructionSelection::EvalInstructio
Q_ASSERT(execAllocator);
#endif
Q_ASSERT(module);
@@ -361,7 +362,7 @@ Index: qtdeclarative-opensource-src-5.4.0/src/qml/compiler/qv4isel_p.cpp
}
EvalInstructionSelection::~EvalInstructionSelection()
-@@ -72,15 +137,307 @@ EvalInstructionSelection::~EvalInstructi
+@@ -69,15 +134,307 @@ EvalInstructionSelection::~EvalInstructi
EvalISelFactory::~EvalISelFactory()
{}
@@ -674,11 +675,11 @@ Index: qtdeclarative-opensource-src-5.4.0/src/qml/compiler/qv4isel_p.cpp
}
void IRDecoder::visitMove(IR::Move *s)
-Index: qtdeclarative-opensource-src-5.4.0/src/qml/compiler/qv4isel_p.h
+Index: qtdeclarative-opensource-src-5.6.0-rc/src/qml/compiler/qv4isel_p.h
===================================================================
---- qtdeclarative-opensource-src-5.4.0.orig/src/qml/compiler/qv4isel_p.h
-+++ qtdeclarative-opensource-src-5.4.0/src/qml/compiler/qv4isel_p.h
-@@ -48,6 +48,10 @@ class QQmlEnginePrivate;
+--- qtdeclarative-opensource-src-5.6.0-rc.orig/src/qml/compiler/qv4isel_p.h
++++ qtdeclarative-opensource-src-5.6.0-rc/src/qml/compiler/qv4isel_p.h
+@@ -59,6 +59,10 @@ class QQmlEnginePrivate;
namespace QV4 {
@@ -689,7 +690,7 @@ Index: qtdeclarative-opensource-src-5.4.0/src/qml/compiler/qv4isel_p.h
class ExecutableAllocator;
struct Function;
-@@ -57,6 +61,7 @@ public:
+@@ -68,6 +72,7 @@ public:
EvalInstructionSelection(QV4::ExecutableAllocator *execAllocator, IR::Module *module, QV4::Compiler::JSUnitGenerator *jsGenerator);
virtual ~EvalInstructionSelection() = 0;
@@ -697,7 +698,7 @@ Index: qtdeclarative-opensource-src-5.4.0/src/qml/compiler/qv4isel_p.h
QQmlRefPointer<QV4::CompiledData::CompilationUnit> compile(bool generateUnitData = true);
void setUseFastLookups(bool b) { useFastLookups = b; }
-@@ -71,10 +76,13 @@ public:
+@@ -82,10 +87,13 @@ public:
int registerRegExp(IR::RegExp *regexp) { return jsGenerator->registerRegExp(regexp); }
int registerJSClass(int count, IR::ExprList *args) { return jsGenerator->registerJSClass(count, args); }
QV4::Compiler::JSUnitGenerator *jsUnitGenerator() const { return jsGenerator; }
@@ -711,7 +712,7 @@ Index: qtdeclarative-opensource-src-5.4.0/src/qml/compiler/qv4isel_p.h
bool useFastLookups;
bool useTypeInference;
-@@ -82,6 +90,7 @@ protected:
+@@ -93,6 +101,7 @@ protected:
QV4::Compiler::JSUnitGenerator *jsGenerator;
QScopedPointer<QV4::Compiler::JSUnitGenerator> ownJSGenerator;
IR::Module *irModule;
@@ -719,10 +720,10 @@ Index: qtdeclarative-opensource-src-5.4.0/src/qml/compiler/qv4isel_p.h
};
class Q_QML_PRIVATE_EXPORT EvalISelFactory
-Index: qtdeclarative-opensource-src-5.4.0/src/qml/jit/qv4assembler.cpp
+Index: qtdeclarative-opensource-src-5.6.0-rc/src/qml/jit/qv4assembler.cpp
===================================================================
---- qtdeclarative-opensource-src-5.4.0.orig/src/qml/jit/qv4assembler.cpp
-+++ qtdeclarative-opensource-src-5.4.0/src/qml/jit/qv4assembler.cpp
+--- qtdeclarative-opensource-src-5.6.0-rc.orig/src/qml/jit/qv4assembler.cpp
++++ qtdeclarative-opensource-src-5.6.0-rc/src/qml/jit/qv4assembler.cpp
@@ -69,7 +69,15 @@ void CompilationUnit::linkBackendToEngin
QV4::Function *runtimeFunction = new QV4::Function(engine, this, compiledFunction,
@@ -740,11 +741,11 @@ Index: qtdeclarative-opensource-src-5.4.0/src/qml/jit/qv4assembler.cpp
}
}
-Index: qtdeclarative-opensource-src-5.4.0/src/qml/jit/qv4assembler_p.h
+Index: qtdeclarative-opensource-src-5.6.0-rc/src/qml/jit/qv4assembler_p.h
===================================================================
---- qtdeclarative-opensource-src-5.4.0.orig/src/qml/jit/qv4assembler_p.h
-+++ qtdeclarative-opensource-src-5.4.0/src/qml/jit/qv4assembler_p.h
-@@ -63,6 +63,16 @@ namespace JIT {
+--- qtdeclarative-opensource-src-5.6.0-rc.orig/src/qml/jit/qv4assembler_p.h
++++ qtdeclarative-opensource-src-5.6.0-rc/src/qml/jit/qv4assembler_p.h
+@@ -74,6 +74,16 @@ namespace JIT {
class InstructionSelection;
@@ -761,7 +762,7 @@ Index: qtdeclarative-opensource-src-5.4.0/src/qml/jit/qv4assembler_p.h
struct CompilationUnit : public QV4::CompiledData::CompilationUnit
{
virtual ~CompilationUnit();
-@@ -75,6 +85,8 @@ struct CompilationUnit : public QV4::Com
+@@ -86,6 +96,8 @@ struct CompilationUnit : public QV4::Com
QVector<JSC::MacroAssemblerCodeRef> codeRefs;
QList<QVector<QV4::Primitive> > constantValues;
@@ -770,7 +771,7 @@ Index: qtdeclarative-opensource-src-5.4.0/src/qml/jit/qv4assembler_p.h
};
struct RelativeCall {
-@@ -1064,7 +1076,12 @@ public:
+@@ -1086,7 +1098,12 @@ public:
move(TrustedImm64(u.i), ReturnValueRegister);
move64ToDouble(ReturnValueRegister, target);
#else
@@ -784,7 +785,7 @@ Index: qtdeclarative-opensource-src-5.4.0/src/qml/jit/qv4assembler_p.h
#endif
return target;
}
-@@ -1152,6 +1169,12 @@ public:
+@@ -1174,6 +1191,12 @@ public:
Label exceptionReturnLabel;
IR::BasicBlock * catchBlock;
QVector<Jump> exceptionPropagationJumps;
@@ -797,10 +798,10 @@ Index: qtdeclarative-opensource-src-5.4.0/src/qml/jit/qv4assembler_p.h
private:
QScopedPointer<const StackLayout> _stackLayout;
ConstantTable _constTable;
-Index: qtdeclarative-opensource-src-5.4.0/src/qml/jit/qv4cachedlinkdata_p.h
+Index: qtdeclarative-opensource-src-5.6.0-rc/src/qml/jit/qv4cachedlinkdata_p.h
===================================================================
--- /dev/null
-+++ qtdeclarative-opensource-src-5.4.0/src/qml/jit/qv4cachedlinkdata_p.h
++++ qtdeclarative-opensource-src-5.6.0-rc/src/qml/jit/qv4cachedlinkdata_p.h
@@ -0,0 +1,188 @@
+/***************************************************************************
+**
@@ -990,10 +991,10 @@ Index: qtdeclarative-opensource-src-5.4.0/src/qml/jit/qv4cachedlinkdata_p.h
+QT_END_NAMESPACE
+
+#endif
-Index: qtdeclarative-opensource-src-5.4.0/src/qml/jit/qv4isel_masm.cpp
+Index: qtdeclarative-opensource-src-5.6.0-rc/src/qml/jit/qv4isel_masm.cpp
===================================================================
---- qtdeclarative-opensource-src-5.4.0.orig/src/qml/jit/qv4isel_masm.cpp
-+++ qtdeclarative-opensource-src-5.4.0/src/qml/jit/qv4isel_masm.cpp
+--- qtdeclarative-opensource-src-5.6.0-rc.orig/src/qml/jit/qv4isel_masm.cpp
++++ qtdeclarative-opensource-src-5.6.0-rc/src/qml/jit/qv4isel_masm.cpp
@@ -43,6 +43,7 @@
#include "qv4assembler_p.h"
#include "qv4unop_p.h"
@@ -1001,8 +1002,8 @@ Index: qtdeclarative-opensource-src-5.4.0/src/qml/jit/qv4isel_masm.cpp
+#include "qv4cachedlinkdata_p.h"
#include <QtCore/QBuffer>
-
-@@ -139,9 +140,13 @@ JSC::MacroAssemblerCodeRef Assembler::li
+ #include <QtCore/QCoreApplication>
+@@ -154,9 +155,13 @@ JSC::MacroAssemblerCodeRef Assembler::li
JSC::LinkBuffer linkBuffer(dummy, this, 0);
QHash<void*, const char*> functions;
@@ -1017,7 +1018,7 @@ Index: qtdeclarative-opensource-src-5.4.0/src/qml/jit/qv4isel_masm.cpp
}
foreach (const DataLabelPatch &p, _dataLabelPatches)
-@@ -277,6 +282,25 @@ void InstructionSelection::run(int funct
+@@ -358,6 +363,25 @@ void InstructionSelection::run(int funct
JSC::MacroAssemblerCodeRef codeRef =_as->link(&dummySize);
compilationUnit->codeRefs[functionIndex] = codeRef;
@@ -1043,7 +1044,7 @@ Index: qtdeclarative-opensource-src-5.4.0/src/qml/jit/qv4isel_masm.cpp
qSwap(_function, function);
delete _as;
_as = oldAssembler;
-@@ -300,6 +324,11 @@ QQmlRefPointer<QV4::CompiledData::Compil
+@@ -381,6 +405,11 @@ QQmlRefPointer<QV4::CompiledData::Compil
return result;
}
@@ -1055,17 +1056,17 @@ Index: qtdeclarative-opensource-src-5.4.0/src/qml/jit/qv4isel_masm.cpp
void InstructionSelection::callBuiltinInvalid(IR::Name *func, IR::ExprList *args, IR::Expr *result)
{
prepareCallData(args, 0);
-@@ -1800,5 +1829,4 @@ void InstructionSelection::visitCJumpEqu
+@@ -1955,5 +1984,4 @@ void InstructionSelection::visitCJumpEqu
_block, trueBlock, falseBlock);
}
-
#endif // ENABLE(ASSEMBLER)
-Index: qtdeclarative-opensource-src-5.4.0/src/qml/jit/qv4isel_masm_p.h
+Index: qtdeclarative-opensource-src-5.6.0-rc/src/qml/jit/qv4isel_masm_p.h
===================================================================
---- qtdeclarative-opensource-src-5.4.0.orig/src/qml/jit/qv4isel_masm_p.h
-+++ qtdeclarative-opensource-src-5.4.0/src/qml/jit/qv4isel_masm_p.h
-@@ -65,8 +65,11 @@ public:
+--- qtdeclarative-opensource-src-5.6.0-rc.orig/src/qml/jit/qv4isel_masm_p.h
++++ qtdeclarative-opensource-src-5.6.0-rc/src/qml/jit/qv4isel_masm_p.h
+@@ -76,8 +76,11 @@ public:
virtual void run(int functionIndex);
const void *addConstantTable(QVector<QV4::Primitive> *values);
@@ -1076,12 +1077,12 @@ Index: qtdeclarative-opensource-src-5.4.0/src/qml/jit/qv4isel_masm_p.h
+ virtual QV4::CompiledData::CompilationUnit* mutableCompilationUnit();
virtual void callBuiltinInvalid(IR::Name *func, IR::ExprList *args, IR::Expr *result);
- virtual void callBuiltinTypeofMember(IR::Expr *base, const QString &name, IR::Expr *result);
-Index: qtdeclarative-opensource-src-5.4.0/src/qml/jsruntime/qv4functionobject.cpp
+ virtual void callBuiltinTypeofQmlContextProperty(IR::Expr *base, IR::Member::MemberKind kind, int propertyIndex, IR::Expr *result);
+Index: qtdeclarative-opensource-src-5.6.0-rc/src/qml/jsruntime/qv4functionobject.cpp
===================================================================
---- qtdeclarative-opensource-src-5.4.0.orig/src/qml/jsruntime/qv4functionobject.cpp
-+++ qtdeclarative-opensource-src-5.4.0/src/qml/jsruntime/qv4functionobject.cpp
-@@ -226,6 +226,7 @@ ReturnedValue FunctionCtor::construct(Ma
+--- qtdeclarative-opensource-src-5.6.0-rc.orig/src/qml/jsruntime/qv4functionobject.cpp
++++ qtdeclarative-opensource-src-5.6.0-rc/src/qml/jsruntime/qv4functionobject.cpp
+@@ -287,6 +287,7 @@ ReturnedValue FunctionCtor::construct(co
Compiler::JSUnitGenerator jsGenerator(&module);
QScopedPointer<EvalInstructionSelection> isel(scope.engine->iselFactory->create(QQmlEnginePrivate::get(scope.engine), scope.engine->executableAllocator, &module, &jsGenerator));
@@ -1089,31 +1090,31 @@ Index: qtdeclarative-opensource-src-5.4.0/src/qml/jsruntime/qv4functionobject.cp
QQmlRefPointer<CompiledData::CompilationUnit> compilationUnit = isel->compile();
Function *vmf = compilationUnit->linkToEngine(scope.engine);
-Index: qtdeclarative-opensource-src-5.4.0/src/qml/jsruntime/qv4qobjectwrapper.cpp
+Index: qtdeclarative-opensource-src-5.6.0-rc/src/qml/jsruntime/qv4qobjectwrapper.cpp
===================================================================
---- qtdeclarative-opensource-src-5.4.0.orig/src/qml/jsruntime/qv4qobjectwrapper.cpp
-+++ qtdeclarative-opensource-src-5.4.0/src/qml/jsruntime/qv4qobjectwrapper.cpp
-@@ -629,6 +629,7 @@ ReturnedValue QObjectWrapper::getPropert
+--- qtdeclarative-opensource-src-5.6.0-rc.orig/src/qml/jsruntime/qv4qobjectwrapper.cpp
++++ qtdeclarative-opensource-src-5.6.0-rc/src/qml/jsruntime/qv4qobjectwrapper.cpp
+@@ -632,6 +632,7 @@ ReturnedValue QObjectWrapper::getPropert
QQmlPropertyCache *cache = ddata->propertyCache;
Q_ASSERT(cache);
QQmlPropertyData *property = cache->property(propertyIndex);
+
Q_ASSERT(property); // We resolved this property earlier, so it better exist!
- return getProperty(object, ctx, property, captureRequired);
+ return getProperty(engine, object, property, captureRequired);
}
-Index: qtdeclarative-opensource-src-5.4.0/src/qml/jsruntime/qv4script.cpp
+Index: qtdeclarative-opensource-src-5.6.0-rc/src/qml/jsruntime/qv4script.cpp
===================================================================
---- qtdeclarative-opensource-src-5.4.0.orig/src/qml/jsruntime/qv4script.cpp
-+++ qtdeclarative-opensource-src-5.4.0/src/qml/jsruntime/qv4script.cpp
-@@ -259,6 +259,7 @@ void Script::parse()
+--- qtdeclarative-opensource-src-5.6.0-rc.orig/src/qml/jsruntime/qv4script.cpp
++++ qtdeclarative-opensource-src-5.6.0-rc/src/qml/jsruntime/qv4script.cpp
+@@ -211,6 +211,7 @@ void Script::parse()
QScopedPointer<EvalInstructionSelection> isel(v4->iselFactory->create(QQmlEnginePrivate::get(v4), v4->executableAllocator, &module, &jsGenerator));
if (inheritContext)
isel->setUseFastLookups(false);
+ isel->setEngine(QQmlEnginePrivate::get(v4));
QQmlRefPointer<QV4::CompiledData::CompilationUnit> compilationUnit = isel->compile();
vmFunction = compilationUnit->linkToEngine(v4);
- ScopedObject holder(valueScope, v4->memoryManager->alloc<CompilationUnitHolder>(v4, compilationUnit));
-@@ -360,6 +361,7 @@ QQmlRefPointer<QV4::CompiledData::Compil
+ ScopedObject holder(valueScope, v4->memoryManager->allocObject<CompilationUnitHolder>(compilationUnit));
+@@ -314,6 +315,7 @@ QQmlRefPointer<QV4::CompiledData::Compil
QScopedPointer<EvalInstructionSelection> isel(engine->iselFactory->create(QQmlEnginePrivate::get(engine), engine->executableAllocator, module, unitGenerator));
isel->setUseFastLookups(false);
@@ -1121,11 +1122,11 @@ Index: qtdeclarative-opensource-src-5.4.0/src/qml/jsruntime/qv4script.cpp
return isel->compile(/*generate unit data*/false);
}
-Index: qtdeclarative-opensource-src-5.4.0/src/qml/qml/qqmlengine.cpp
+Index: qtdeclarative-opensource-src-5.6.0-rc/src/qml/qml/qqmlengine.cpp
===================================================================
---- qtdeclarative-opensource-src-5.4.0.orig/src/qml/qml/qqmlengine.cpp
-+++ qtdeclarative-opensource-src-5.4.0/src/qml/qml/qqmlengine.cpp
-@@ -559,7 +559,8 @@ QQmlEnginePrivate::QQmlEnginePrivate(QQm
+--- qtdeclarative-opensource-src-5.6.0-rc.orig/src/qml/qml/qqmlengine.cpp
++++ qtdeclarative-opensource-src-5.6.0-rc/src/qml/qml/qqmlengine.cpp
+@@ -599,7 +599,8 @@ QQmlEnginePrivate::QQmlEnginePrivate(QQm
activeObjectCreator(0),
networkAccessManager(0), networkAccessManagerFactory(0), urlInterceptor(0),
scarceResourcesRefCount(0), typeLoader(e), importDatabase(e), uniqueId(1),
@@ -1135,11 +1136,11 @@ Index: qtdeclarative-opensource-src-5.4.0/src/qml/qml/qqmlengine.cpp
{
}
-Index: qtdeclarative-opensource-src-5.4.0/src/qml/qml/qqmlengine_p.h
+Index: qtdeclarative-opensource-src-5.6.0-rc/src/qml/qml/qqmlengine_p.h
===================================================================
---- qtdeclarative-opensource-src-5.4.0.orig/src/qml/qml/qqmlengine_p.h
-+++ qtdeclarative-opensource-src-5.4.0/src/qml/qml/qqmlengine_p.h
-@@ -263,6 +263,8 @@ public:
+--- qtdeclarative-opensource-src-5.6.0-rc.orig/src/qml/qml/qqmlengine_p.h
++++ qtdeclarative-opensource-src-5.6.0-rc/src/qml/qml/qqmlengine_p.h
+@@ -250,6 +250,8 @@ public:
mutable QMutex networkAccessManagerMutex;
@@ -1147,12 +1148,12 @@ Index: qtdeclarative-opensource-src-5.4.0/src/qml/qml/qqmlengine_p.h
+
private:
// Must be called locked
- QQmlPropertyCache *createCache(QQmlType *, int, QQmlError &error);
-Index: qtdeclarative-opensource-src-5.4.0/src/qml/compiler/qv4isel_moth.cpp
+ QQmlPropertyCache *createCache(QQmlType *, int);
+Index: qtdeclarative-opensource-src-5.6.0-rc/src/qml/compiler/qv4isel_moth.cpp
===================================================================
---- qtdeclarative-opensource-src-5.4.0.orig/src/qml/compiler/qv4isel_moth.cpp
-+++ qtdeclarative-opensource-src-5.4.0/src/qml/compiler/qv4isel_moth.cpp
-@@ -457,6 +457,11 @@ QQmlRefPointer<QV4::CompiledData::Compil
+--- qtdeclarative-opensource-src-5.6.0-rc.orig/src/qml/compiler/qv4isel_moth.cpp
++++ qtdeclarative-opensource-src-5.6.0-rc/src/qml/compiler/qv4isel_moth.cpp
+@@ -451,6 +451,11 @@ QQmlRefPointer<QV4::CompiledData::Compil
return result;
}
@@ -1164,11 +1165,11 @@ Index: qtdeclarative-opensource-src-5.4.0/src/qml/compiler/qv4isel_moth.cpp
void InstructionSelection::callValue(IR::Expr *value, IR::ExprList *args, IR::Expr *result)
{
Instruction::CallValue call;
-Index: qtdeclarative-opensource-src-5.4.0/src/qml/jsruntime/qv4global_p.h
+Index: qtdeclarative-opensource-src-5.6.0-rc/src/qml/jsruntime/qv4global_p.h
===================================================================
---- qtdeclarative-opensource-src-5.4.0.orig/src/qml/jsruntime/qv4global_p.h
-+++ qtdeclarative-opensource-src-5.4.0/src/qml/jsruntime/qv4global_p.h
-@@ -96,6 +96,9 @@ inline double trunc(double d) { return d
+--- qtdeclarative-opensource-src-5.6.0-rc.orig/src/qml/jsruntime/qv4global_p.h
++++ qtdeclarative-opensource-src-5.6.0-rc/src/qml/jsruntime/qv4global_p.h
+@@ -116,6 +116,9 @@ inline double trunc(double d) { return d
#define ENABLE_YARR_JIT 1
#define ENABLE_JIT 1
#define ENABLE_ASSEMBLER 1
diff --git a/debian/patches/fix_binary_location_for_tests.patch b/debian/patches/fix_binary_location_for_tests.patch
index b032c90..36ccee2 100644
--- a/debian/patches/fix_binary_location_for_tests.patch
+++ b/debian/patches/fix_binary_location_for_tests.patch
@@ -1,7 +1,8 @@
-diff -ruN a/tests/auto/qml/qmlmin/tst_qmlmin.cpp b/tests/auto/qml/qmlmin/tst_qmlmin.cpp
---- a/tests/auto/qml/qmlmin/tst_qmlmin.cpp 2013-11-21 01:16:04.000000000 +0500
-+++ b/tests/auto/qml/qmlmin/tst_qmlmin.cpp 2013-12-21 14:55:25.614708078 +0500
-@@ -75,7 +75,7 @@
+Index: qtdeclarative-opensource-src-5.6.0-rc/tests/auto/qml/qmlmin/tst_qmlmin.cpp
+===================================================================
+--- qtdeclarative-opensource-src-5.6.0-rc.orig/tests/auto/qml/qmlmin/tst_qmlmin.cpp
++++ qtdeclarative-opensource-src-5.6.0-rc/tests/auto/qml/qmlmin/tst_qmlmin.cpp
+@@ -67,7 +67,7 @@ tst_qmlmin::tst_qmlmin()
void tst_qmlmin::initTestCase()
{
@@ -10,10 +11,11 @@ diff -ruN a/tests/auto/qml/qmlmin/tst_qmlmin.cpp b/tests/auto/qml/qmlmin/tst_qml
#ifdef Q_OS_WIN
qmlminPath += QLatin1String(".exe");
#endif
-diff -ruN a/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp b/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp
---- a/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp 2013-11-21 01:16:05.000000000 +0500
-+++ b/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp 2013-12-21 14:55:28.574708157 +0500
-@@ -66,7 +66,7 @@
+Index: qtdeclarative-opensource-src-5.6.0-rc/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp
+===================================================================
+--- qtdeclarative-opensource-src-5.6.0-rc.orig/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp
++++ qtdeclarative-opensource-src-5.6.0-rc/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp
+@@ -59,7 +59,7 @@ tst_qmlplugindump::tst_qmlplugindump()
void tst_qmlplugindump::initTestCase()
{
@@ -22,23 +24,25 @@ diff -ruN a/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp b/tests/auto/qml/
#if defined(Q_OS_WIN)
qmlplugindumpPath += QLatin1String("/qmlplugindump.exe");
-diff -ruN a/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp b/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp
---- a/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp 2013-12-08 22:10:16.000000000 +0500
-+++ b/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp 2014-01-03 12:20:08.520795476 +0500
-@@ -833,7 +833,7 @@
- bool tst_QQmlDebugJS::init(const QString &qmlFile, bool blockMode)
+Index: qtdeclarative-opensource-src-5.6.0-rc/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp
+===================================================================
+--- qtdeclarative-opensource-src-5.6.0-rc.orig/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp
++++ qtdeclarative-opensource-src-5.6.0-rc/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp
+@@ -829,7 +829,7 @@ void tst_QQmlDebugJS::cleanupTestCase()
+ void tst_QQmlDebugJS::init(const QString &qmlFile, bool blockMode, bool restrictServices)
{
connection = new QQmlDebugConnection();
- process = new QQmlDebugProcess(QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qmlscene", this);
+ process = new QQmlDebugProcess(QLatin1String("../../../../../bin") + "/qmlscene", this);
client = new QJSDebugClient(connection);
- if (blockMode)
-diff -ruN a/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp b/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp
---- a/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp 2013-12-08 22:10:16.000000000 +0500
-+++ b/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp 2014-01-03 12:21:06.904797040 +0500
-@@ -108,7 +108,7 @@
- const QString argument = "-qmljsdebugger=port:" STR_PORT_FROM "," STR_PORT_TO ",block";
+ const char *args = 0;
+Index: qtdeclarative-opensource-src-5.6.0-rc/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp
+===================================================================
+--- qtdeclarative-opensource-src-5.6.0-rc.orig/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp
++++ qtdeclarative-opensource-src-5.6.0-rc/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp
+@@ -102,7 +102,7 @@ void tst_QQmlEngineDebugInspectorIntegra
+ QString());
// ### Still using qmlscene because of QTBUG-33376
- m_process = new QQmlDebugProcess(QLibraryInfo::location(QLibraryInfo::BinariesPath)
@@ -46,11 +50,12 @@ diff -ruN a/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_
+ "/qmlscene", this);
m_process->start(QStringList() << argument << testFile("qtquick2.qml"));
QVERIFY2(m_process->waitForSessionStart(),
-diff -ruN a/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp b/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp
---- a/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp 2013-12-08 22:10:16.000000000 +0500
-+++ b/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp 2014-01-03 12:23:24.248800718 +0500
-@@ -90,7 +90,7 @@
- const QString argument = "-qmljsdebugger=port:" STR_PORT_FROM "," STR_PORT_TO ",block";
+Index: qtdeclarative-opensource-src-5.6.0-rc/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp
+===================================================================
+--- qtdeclarative-opensource-src-5.6.0-rc.orig/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp
++++ qtdeclarative-opensource-src-5.6.0-rc/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp
+@@ -84,7 +84,7 @@ void tst_QQmlInspector::startQmlscenePro
+ .arg(restrictServices ? QStringLiteral(",services:QmlInspector") : QString());
// ### This should be using qml instead of qmlscene, but can't because of QTBUG-33376 (same as the XFAIL testcase)
- m_process = new QQmlDebugProcess(QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qmlscene", this);
@@ -58,15 +63,16 @@ diff -ruN a/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp b/tests/
m_process->start(QStringList() << argument << testFile("qtquick2.qml"));
QVERIFY2(m_process->waitForSessionStart(),
"Could not launch application, or did not get 'Waiting for connection'.");
-diff -ruN a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
---- a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp 2013-12-08 22:10:16.000000000 +0500
-+++ b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp 2014-01-03 12:22:18.392798954 +0500
-@@ -298,7 +298,7 @@
- void tst_QQmlProfilerService::connect(bool block, const QString &testFile)
+Index: qtdeclarative-opensource-src-5.6.0-rc/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
+===================================================================
+--- qtdeclarative-opensource-src-5.6.0-rc.orig/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
++++ qtdeclarative-opensource-src-5.6.0-rc/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
+@@ -359,7 +359,7 @@ void QQmlProfilerClient::messageReceived
+ void tst_QQmlProfilerService::connect(bool block, const QString &testFile, bool restrictServices)
{
// ### Still using qmlscene due to QTBUG-33377
- const QString executable = QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qmlscene";
+ const QString executable = QLatin1String("../../../../../bin") + "/qmlscene";
QStringList arguments;
- if (block)
- arguments << QString("-qmljsdebugger=port:" STR_PORT_FROM "," STR_PORT_TO ",block");
+ arguments << QString::fromLatin1("-qmljsdebugger=port:%1,%2%3%4")
+ .arg(STR_PORT_FROM).arg(STR_PORT_TO)
--
qtdeclarative packaging
More information about the pkg-kde-commits
mailing list