QML: fix mixed debug/release build on OSX.

Dyld will take the debug library and link it against the release
versions of the frameworks. (Using the debug versions is an option to
dyld when starting an application.) This requires all symbols in both
debug and release libraries in frameworks to be the same.

Change-Id: I6d96bcdf8577f1dffc63c508cb7adc0db2acc486
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>

diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp
index 92993259ec332fbdc7ca139b1744a49c15eb2a02..3b89851d819f6d1677e6c8248bc7cbfbfd4e928d 100644 (file)
--- a/src/qml/jsruntime/qv4engine.cpp
+++ b/src/qml/jsruntime/qv4engine.cpp
@@ -1623,14 +1623,10 @@ QV4::ReturnedValue ExecutionEngine::metaTypeToJS(int type, const void *data)
     return 0;
 }
 
-#ifndef QT_NO_DEBUG
 void ExecutionEngine::assertObjectBelongsToEngine(const Value &v)
 {
-    if (!v.isObject())
-        return;
-    Q_ASSERT(v.objectValue()->engine() == this);
+    Q_ASSERT(!v.isObject() || v.objectValue()->engine() == this);
 }
-#endif
 
 // Converts a JS value to a meta-type.
 // data must point to a place that can store a value of the given type.

diff --git a/src/qml/jsruntime/qv4engine_p.h b/src/qml/jsruntime/qv4engine_p.h
index 277cbdf1f55b0150aa1068730259a9a904e384f1..c0c88abaa5fb0149f00b232446b1d72a2f7970f7 100644 (file)
--- a/src/qml/jsruntime/qv4engine_p.h
+++ b/src/qml/jsruntime/qv4engine_p.h
@@ -340,9 +340,7 @@ public:
     bool metaTypeFromJS(const Value &value, int type, void *data);
     QV4::ReturnedValue metaTypeToJS(int type, const void *data);
 
-#ifndef QT_NO_DEBUG
     void assertObjectBelongsToEngine(const Value &v);
-#endif
 
 private:
     QmlExtensions *m_qmlExtensions;