diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-19 03:02:13 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-19 03:02:13 +0100 |
commit | ab3f71c897cffff0398da60c628d6700760ed13a (patch) | |
tree | 6e62773f507cd800dc7dd76470ca6d2d27d7550f | |
parent | a21580952f5ba9dbde3ee5a9a7119e2afa692b87 (diff) | |
parent | 313e6548b0393af9069b043f65ea6e6c0a546487 (diff) | |
download | qtscript-ab3f71c897cffff0398da60c628d6700760ed13a.tar.gz |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I3f44bdfa576789fea2b931205835bd42cd798f8a
6 files changed, 0 insertions, 12 deletions
diff --git a/src/scripttools/debugging/qscriptbreakpointdata.cpp b/src/scripttools/debugging/qscriptbreakpointdata.cpp index 6c7ed28..505a861 100644 --- a/src/scripttools/debugging/qscriptbreakpointdata.cpp +++ b/src/scripttools/debugging/qscriptbreakpointdata.cpp @@ -345,7 +345,6 @@ bool QScriptBreakpointData::operator!=(const QScriptBreakpointData &other) const } /*! - \fn QDataStream &operator<<(QDataStream &stream, const QScriptBreakpointData &data) \relates QScriptBreakpointData Writes the given \a data to the specified \a stream. @@ -366,7 +365,6 @@ QDataStream &operator<<(QDataStream &out, const QScriptBreakpointData &data) } /*! - \fn QDataStream &operator>>(QDataStream &stream, QScriptBreakpointData &data) \relates QScriptBreakpointData Reads a QScriptBreakpointData from the specified \a stream into the diff --git a/src/scripttools/debugging/qscriptdebuggercommand.cpp b/src/scripttools/debugging/qscriptdebuggercommand.cpp index 2b8a26a..f264d28 100644 --- a/src/scripttools/debugging/qscriptdebuggercommand.cpp +++ b/src/scripttools/debugging/qscriptdebuggercommand.cpp @@ -656,7 +656,6 @@ QScriptDebuggerCommand QScriptDebuggerCommand::clearExceptionsCommand() } /*! - \fn QDataStream &operator<<(QDataStream &stream, const QScriptDebuggerCommand &command) \relates QScriptDebuggerCommand Writes the given \a command to the specified \a stream. @@ -675,7 +674,6 @@ QDataStream &operator<<(QDataStream &out, const QScriptDebuggerCommand &command) } /*! - \fn QDataStream &operator>>(QDataStream &stream, QScriptDebuggerCommand &command) \relates QScriptDebuggerCommand Reads a QScriptDebuggerCommand from the specified \a stream into the diff --git a/src/scripttools/debugging/qscriptdebuggerevent.cpp b/src/scripttools/debugging/qscriptdebuggerevent.cpp index efeb979..e4c59ff 100644 --- a/src/scripttools/debugging/qscriptdebuggerevent.cpp +++ b/src/scripttools/debugging/qscriptdebuggerevent.cpp @@ -267,7 +267,6 @@ bool QScriptDebuggerEvent::operator!=(const QScriptDebuggerEvent &other) const } /*! - \fn QDataStream &operator<<(QDataStream &stream, const QScriptDebuggerEvent &event) \relates QScriptDebuggerEvent Writes the given \a event to the specified \a stream. @@ -286,7 +285,6 @@ QDataStream &operator<<(QDataStream &out, const QScriptDebuggerEvent &event) } /*! - \fn QDataStream &operator>>(QDataStream &stream, QScriptDebuggerEvent &event) \relates QScriptDebuggerEvent Reads a QScriptDebuggerEvent from the specified \a stream into the diff --git a/src/scripttools/debugging/qscriptdebuggerresponse.cpp b/src/scripttools/debugging/qscriptdebuggerresponse.cpp index ee588ef..7eb4c18 100644 --- a/src/scripttools/debugging/qscriptdebuggerresponse.cpp +++ b/src/scripttools/debugging/qscriptdebuggerresponse.cpp @@ -310,7 +310,6 @@ bool QScriptDebuggerResponse::operator!=(const QScriptDebuggerResponse &other) c } /*! - \fn QDataStream &operator<<(QDataStream &stream, const QScriptDebuggerResponse &response) \relates QScriptDebuggerResponse Writes the given \a response to the specified \a stream. @@ -325,7 +324,6 @@ QDataStream &operator<<(QDataStream &out, const QScriptDebuggerResponse &respons } /*! - \fn QDataStream &operator>>(QDataStream &stream, QScriptDebuggerResponse &response) \relates QScriptDebuggerResponse Reads a QScriptDebuggerResponse from the specified \a stream into the diff --git a/src/scripttools/debugging/qscriptdebuggervalue.cpp b/src/scripttools/debugging/qscriptdebuggervalue.cpp index 2d0bcc2..46aba91 100644 --- a/src/scripttools/debugging/qscriptdebuggervalue.cpp +++ b/src/scripttools/debugging/qscriptdebuggervalue.cpp @@ -327,7 +327,6 @@ bool QScriptDebuggerValue::operator!=(const QScriptDebuggerValue &other) const } /*! - \fn QDataStream &operator<<(QDataStream &stream, const QScriptDebuggerValue &value) \relates QScriptDebuggerValue Writes the given \a value to the specified \a stream. @@ -357,7 +356,6 @@ QDataStream &operator<<(QDataStream &out, const QScriptDebuggerValue &value) } /*! - \fn QDataStream &operator>>(QDataStream &stream, QScriptDebuggerValue &value) \relates QScriptDebuggerValue Reads a QScriptDebuggerValue from the specified \a stream into the diff --git a/src/scripttools/debugging/qscriptdebuggervalueproperty.cpp b/src/scripttools/debugging/qscriptdebuggervalueproperty.cpp index f0c86d2..f46d3dd 100644 --- a/src/scripttools/debugging/qscriptdebuggervalueproperty.cpp +++ b/src/scripttools/debugging/qscriptdebuggervalueproperty.cpp @@ -175,7 +175,6 @@ bool QScriptDebuggerValueProperty::isValid() const } /*! - \fn QDataStream &operator<<(QDataStream &stream, const QScriptDebuggerValueProperty &property) \relates QScriptDebuggerValueProperty Writes the given \a property to the specified \a stream. @@ -190,7 +189,6 @@ QDataStream &operator<<(QDataStream &out, const QScriptDebuggerValueProperty &pr } /*! - \fn QDataStream &operator>>(QDataStream &stream, QScriptDebuggerValueProperty &property) \relates QScriptDebuggerValueProperty Reads a QScriptDebuggerValueProperty from the specified \a stream into the |