diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-08-31 00:16:40 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-08-31 00:16:40 (GMT) |
| commit | 9dade8d2e57655019ed4dc2fcdc4e226401138a2 (patch) | |
| tree | 6aa3520f525b2ab923b4238079f1012756fa2488 /src/script/bridge/qscriptvariant.cpp | |
| parent | e1dd37f6b54881aef3b9e1e686dc56bb96fc14ed (diff) | |
| parent | d23863952b0c13ccd8b2989d24153d94b3d3f83d (diff) | |
| download | Qt-9dade8d2e57655019ed4dc2fcdc4e226401138a2.zip Qt-9dade8d2e57655019ed4dc2fcdc4e226401138a2.tar.gz Qt-9dade8d2e57655019ed4dc2fcdc4e226401138a2.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
src/gui/graphicsview/qgraphicsitem.cpp
src/gui/graphicsview/qgraphicsitem.h
src/gui/graphicsview/qgraphicsitem_p.h
src/gui/graphicsview/qgraphicsscene.cpp
Diffstat (limited to 'src/script/bridge/qscriptvariant.cpp')
| -rw-r--r-- | src/script/bridge/qscriptvariant.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script/bridge/qscriptvariant.cpp b/src/script/bridge/qscriptvariant.cpp index c4a152a..ab75a02 100644 --- a/src/script/bridge/qscriptvariant.cpp +++ b/src/script/bridge/qscriptvariant.cpp @@ -137,7 +137,7 @@ static JSC::JSValue JSC_HOST_CALL variantProtoFuncToString(JSC::ExecState *exec, JSC::JSValue value = variantProtoFuncValueOf(exec, callee, thisValue, args); if (value.isObject()) { result = v.toString(); - if (result.isEmpty()) { + if (result.isEmpty() && !v.canConvert(QVariant::String)) { result = "QVariant("; result += v.typeName(); result += ")"; |