projects
/
konrad/qtdeclarative.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
(parent:
212204b
)
Remove use of QT_ASCII_CAST_WARN_CONSTRUCTOR.
author
Stephen Kelly
<stephen.kelly@kdab.com>
Wed, 22 Feb 2012 23:34:32 +0000 (
00:34
+0100)
committer
Qt by Nokia
<qt-info@nokia.com>
Fri, 24 Feb 2012 00:46:28 +0000 (
01:46
+0100)
Fixes build after I0b4df4c99600cacbaafbf0bc4270cd4978600956
Change-Id: I9cf326b52e0e7e267b8fbc422175713cee9352f5
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
src/declarative/qml/v8/qjsvalue.h
patch
|
blob
|
history
diff --git
a/src/declarative/qml/v8/qjsvalue.h
b/src/declarative/qml/v8/qjsvalue.h
index
bfe0ec0
..
07fe3dc
100644
(file)
--- a/
src/declarative/qml/v8/qjsvalue.h
+++ b/
src/declarative/qml/v8/qjsvalue.h
@@
-68,7
+68,7
@@
public:
QJSValue(const QString &value);
QJSValue(const QLatin1String &value);
#ifndef QT_NO_CAST_FROM_ASCII
- QT_ASCII_CAST_WARN_CONSTRUCTOR QJSValue(const char *str);
+ QT_ASCII_CAST_WARN QJSValue(const char *str);
#endif
QJSValue &operator=(const QJSValue &other);