1 files changed, 28 insertions, 23 deletions

diff --git a/src/plugins/qmltooling/qmldbg_debugger/qqmlnativedebugservice.cpp b/src/plugins/qmltooling/qmldbg_debugger/qqmlnativedebugservice.cpp
index 24d2a82413..e3b2bc0870 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/qqmlnativedebugservice.cpp
+++ b/src/plugins/qmltooling/qmldbg_debugger/qqmlnativedebugservice.cpp
@@ -1,37 +1,44 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtQml module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
 
 #include "qqmlnativedebugservice.h"
+#include "qqmldebugpacket.h"
 
 #include <private/qqmldebugconnector_p.h>
 #include <private/qv4debugging_p.h>
@@ -46,8 +53,7 @@
 #include <private/qv4isel_moth_p.h>
 #include <private/qqmldebugserviceinterfaces_p.h>
 
-#include <qqmlengine.h>
-
+#include <QtQml/qjsengine.h>
 #include <QtCore/qjsonarray.h>
 #include <QtCore/qjsondocument.h>
 #include <QtCore/qjsonobject.h>
@@ -313,16 +319,15 @@ void NativeDebugger::handleCommand(QJsonObject *response, const QString &cmd,
 
 static QString encodeContext(QV4::ExecutionContext *executionContext)
 {
-    QByteArray ba;
-    QDataStream ds(&ba, QIODevice::WriteOnly);
+    QQmlDebugPacket ds;
     ds << quintptr(executionContext);
-    return QString::fromLatin1(ba.toHex());
+    return QString::fromLatin1(ds.data().toHex());
 }
 
 static void decodeContext(const QString &context, QV4::ExecutionContext **executionContext)
 {
     quintptr rawContext;
-    QDataStream ds(QByteArray::fromHex(context.toLatin1()));
+    QQmlDebugPacket ds(QByteArray::fromHex(context.toLatin1()));
     ds >> rawContext;
     *executionContext = reinterpret_cast<QV4::ExecutionContext *>(rawContext);
 }
@@ -699,7 +704,7 @@ bool NativeDebugger::reallyHitTheBreakPoint(const QV4::Function *function, int l
         const BreakPoint &bp = m_service->m_breakHandler->m_breakPoints.at(i);
         if (bp.lineNumber == lineNumber) {
             const QString fileName = function->sourceFile();
-            const QString base = fileName.mid(fileName.lastIndexOf('/') + 1);
+            const QStringRef base = fileName.midRef(fileName.lastIndexOf('/') + 1);
             if (bp.fileName.endsWith(base)) {
                 if (bp.condition.isEmpty() || checkCondition(bp.condition)) {
                     BreakPoint &mbp = m_service->m_breakHandler->m_breakPoints[i];
@@ -724,7 +729,7 @@ QQmlNativeDebugServiceImpl::~QQmlNativeDebugServiceImpl()
     delete m_breakHandler;
 }
 
-void QQmlNativeDebugServiceImpl::engineAboutToBeAdded(QQmlEngine *engine)
+void QQmlNativeDebugServiceImpl::engineAboutToBeAdded(QJSEngine *engine)
 {
     TRACE_PROTOCOL("Adding engine" << engine);
     if (engine) {
@@ -741,7 +746,7 @@ void QQmlNativeDebugServiceImpl::engineAboutToBeAdded(QQmlEngine *engine)
     QQmlDebugService::engineAboutToBeAdded(engine);
 }
 
-void QQmlNativeDebugServiceImpl::engineAboutToBeRemoved(QQmlEngine *engine)
+void QQmlNativeDebugServiceImpl::engineAboutToBeRemoved(QJSEngine *engine)
 {
     TRACE_PROTOCOL("Removing engine" << engine);
     if (engine) {