diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:06:14 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:06:15 +0200 |
| commit | 55490690f81eba168b06a90e4a66cefc20b38252 (patch) | |
| tree | 9c6b6b9234aa767af1c69cac4d4cf896f292be20 /src/qml/jsruntime | |
| parent | 5624e82d068ebab254239121810fc097af7fcb40 (diff) | |
| parent | d8f84e5769632544dfac5138348481330c4da4cd (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I61ab3d0bd8cc02f640c60c037226eace09ec09ba
Diffstat (limited to 'src/qml/jsruntime')
| -rw-r--r-- | src/qml/jsruntime/qv4alloca_p.h | 2 | ||||
| -rw-r--r-- | src/qml/jsruntime/qv4string_p.h | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/qml/jsruntime/qv4alloca_p.h b/src/qml/jsruntime/qv4alloca_p.h index c21878fa42..1e9f83a90e 100644 --- a/src/qml/jsruntime/qv4alloca_p.h +++ b/src/qml/jsruntime/qv4alloca_p.h @@ -58,7 +58,7 @@ #elif QT_CONFIG(alloca_malloc_h) # include <malloc.h> // This does not matter unless compiling in strict standard mode. -# ifdef Q_OS_WIN +# ifdef Q_CC_MSVC # define alloca _alloca # endif #else diff --git a/src/qml/jsruntime/qv4string_p.h b/src/qml/jsruntime/qv4string_p.h index df0394d4cb..2f34dd6139 100644 --- a/src/qml/jsruntime/qv4string_p.h +++ b/src/qml/jsruntime/qv4string_p.h @@ -175,10 +175,6 @@ struct Q_QML_PRIVATE_EXPORT String : public Managed { } uint toUInt(bool *ok) const; - Q_DECL_DEPRECATED void makeIdentifier(ExecutionEngine *) { - makeIdentifier(); - } - void makeIdentifier() const { if (d()->identifier) return; |