diff options
| author | Erik Verbruggen <erik.verbruggen@theqtcompany.com> | 2015-05-11 10:16:37 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-05-12 08:49:09 +0000 |
| commit | d76921e3082cd311207cd4c822ef2d357519b12f (patch) | |
| tree | a12b29e479ea4a7a698b0f030f68fb83d6dcec12 /src/qml/jsruntime/qv4engine.cpp | |
| parent | 4e944555aa1b9efa30b07ebb5bc5191c2ea6c130 (diff) | |
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>
Diffstat (limited to 'src/qml/jsruntime/qv4engine.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4engine.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp index 92993259ec..3b89851d81 100644 --- 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. |