projects
/
profile
/
ivi
/
qtbase.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d065dfd
)
QConstStringData -> QStaticStringData
author
João Abecasis
<joao.abecasis@nokia.com>
Sun, 5 Feb 2012 13:38:36 +0000
(14:38 +0100)
committer
Qt by Nokia
<qt-info@nokia.com>
Mon, 6 Feb 2012 16:34:27 +0000
(17:34 +0100)
The class was renamed in
fed603fde515339ec520accefded211ac6f69982
.
Change-Id: I859f318e80a739f31c2666d0e3088c62b55c5f13
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
src/corelib/json/qjsonvalue.cpp
patch
|
blob
|
history
diff --git
a/src/corelib/json/qjsonvalue.cpp
b/src/corelib/json/qjsonvalue.cpp
index
603cba8
..
ec63db7
100644
(file)
--- a/
src/corelib/json/qjsonvalue.cpp
+++ b/
src/corelib/json/qjsonvalue.cpp
@@
-400,7
+400,7
@@
QString QJsonValue::toString() const
if (t != String)
return QString();
stringData->ref.ref(); // the constructor below doesn't add a ref.
- return QString(*(const Q
Const
StringData<1> *)stringData);
+ return QString(*(const Q
Static
StringData<1> *)stringData);
}
/*!