Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

Conflicts:
	src/declarative/qml/qmlmetatype.cpp

1 files changed, 16 insertions, 2 deletions

diff --git a/src/declarative/qml/qmlcompiler.cpp b/src/declarative/qml/qmlcompiler.cpp
index ee0c484..8edf023 100644
--- a/src/declarative/qml/qmlcompiler.cpp
+++ b/src/declarative/qml/qmlcompiler.cpp
@@ -2529,12 +2529,26 @@ bool QmlCompiler::completeComponentBuild()
 
             // Pre-rewrite the expression
             QString expression = binding.expression.asScript();
+
+            // ### Optimize
+            QmlRewrite::SharedBindingTester sharableTest;
+            bool isSharable = sharableTest.isSharable(expression);
+            
             QmlRewrite::RewriteBinding rewriteBinding;
             expression = rewriteBinding(expression);
 
             quint32 length = expression.length();
-            quint32 pc = output->programs.length();
-            output->programs.append(0);
+            quint32 pc; 
+            
+            if (isSharable) {
+                pc = output->cachedClosures.count();
+                pc |= 0x80000000;
+                output->cachedClosures.append(0);
+            } else {
+                pc = output->cachedPrograms.length();
+                output->cachedPrograms.append(0);
+            }
+
             binding.compiledData =
                 QByteArray((const char *)&pc, sizeof(quint32)) +
                 QByteArray((const char *)&length, sizeof(quint32)) +