Ricardo Mendoza has proposed merging 
lp:~ricmm/kubuntu-packaging/qtdec-530-rtm-sync-cache into 
lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src_530_rtm.

Commit message:
   * debian/patches/QML-Compilation-unit-caching-and-JIT-changes.patch:
    - Make sure caching is kept only to files on disk, and not inline code
      or embedded QRCs.


Requested reviews:
  Kubuntu Packagers (kubuntu-packagers)

For more details, see:
https://code.launchpad.net/~ricmm/kubuntu-packaging/qtdec-530-rtm-sync-cache/+merge/238206
-- 
https://code.launchpad.net/~ricmm/kubuntu-packaging/qtdec-530-rtm-sync-cache/+merge/238206
Your team Kubuntu Packagers is requested to review the proposed merge of 
lp:~ricmm/kubuntu-packaging/qtdec-530-rtm-sync-cache into 
lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src_530_rtm.
=== modified file 'debian/changelog'
--- debian/changelog	2014-10-13 13:24:03 +0000
+++ debian/changelog	2014-10-13 19:27:09 +0000
@@ -1,3 +1,11 @@
+qtdeclarative-opensource-src (5.3.0-3ubuntu14~test2) utopic; urgency=medium
+
+   * debian/patches/QML-Compilation-unit-caching-and-JIT-changes.patch:
+    - Make sure caching is kept only to files on disk, and not inline code
+      or embedded QRCs.
+
+ -- Ricardo Mendoza <[email protected]>  Mon, 13 Oct 2014 21:10:31 +0200
+
 qtdeclarative-opensource-src (5.3.0-3ubuntu14~test1) utopic; urgency=medium
 
   * debian/patches/QML-Compilation-unit-caching-and-JIT-changes.patch:

=== modified file 'debian/patches/QML-Compilation-unit-caching-and-JIT-changes.patch'
--- debian/patches/QML-Compilation-unit-caching-and-JIT-changes.patch	2014-10-13 13:24:03 +0000
+++ debian/patches/QML-Compilation-unit-caching-and-JIT-changes.patch	2014-10-13 19:27:09 +0000
@@ -276,16 +276,17 @@
  EvalInstructionSelection::EvalInstructionSelection(QV4::ExecutableAllocator *execAllocator, Module *module, QV4::Compiler::JSUnitGenerator *jsGenerator)
      : useFastLookups(true)
      , executableAllocator(execAllocator)
-@@ -71,6 +129,8 @@ EvalInstructionSelection::EvalInstructio
+@@ -71,6 +129,9 @@ EvalInstructionSelection::EvalInstructio
      Q_ASSERT(execAllocator);
  #endif
      Q_ASSERT(module);
 +
-+    do_cache = qgetenv("QV4_NO_JIT_CACHE").isEmpty();
++    // Disable on env var and only cache files-on-disk (no qrc or inlines)
++    do_cache = qgetenv("QV4_NO_JIT_CACHE").isEmpty() && irModule->fileName.startsWith(QStringLiteral("file://"));
  }
  
  EvalInstructionSelection::~EvalInstructionSelection()
-@@ -79,15 +139,299 @@ EvalInstructionSelection::~EvalInstructi
+@@ -79,15 +140,299 @@ EvalInstructionSelection::~EvalInstructi
  EvalISelFactory::~EvalISelFactory()
  {}
  

-- 
kubuntu-devel mailing list
[email protected]
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel

Reply via email to