projects
/
platform
/
upstream
/
qtdeclarative.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6b48a85
)
More correct assertion in QHasheV4String
author
Lars Knoll
<lars.knoll@digia.com>
Tue, 25 Jun 2013 19:22:47 +0000
(21:22 +0200)
committer
The Qt Project
<gerrit-noreply@qt-project.org>
Fri, 28 Jun 2013 12:55:52 +0000
(14:55 +0200)
Change-Id: Id34dcae9c7e52fe0262b4d9480a7307a393226ee
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
src/qml/qml/ftw/qhashedstring_p.h
patch
|
blob
|
history
diff --git
a/src/qml/qml/ftw/qhashedstring_p.h
b/src/qml/qml/ftw/qhashedstring_p.h
index
8af9e3f
..
ca95839
100644
(file)
--- a/
src/qml/qml/ftw/qhashedstring_p.h
+++ b/
src/qml/qml/ftw/qhashedstring_p.h
@@
-1135,7
+1135,7
@@
QHashedV4String::QHashedV4String()
QHashedV4String::QHashedV4String(const QV4::Value &s)
: m_string(s)
{
- Q_ASSERT(
!s.toQString().isEmpty
());
+ Q_ASSERT(
s.isString
());
}
QHashedV4String::QHashedV4String(const QHashedV4String &string)