Make sure we don't include qv4stackframe_p.h in qmldevtools

The only thing we need is CallData, which is now provided as separate
file.

Change-Id: Iccbab67ac30d09077075b200f18d1d694f3ecb2a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

src/qml/compiler/qv4codegen_p.h

@@ -58,7 +58,7 @@
 #include <private/qv4compilercontext_p.h>
 #include <private/qv4util_p.h>
 #include <private/qv4bytecodegenerator_p.h>
-#include <private/qv4stackframe_p.h>
+#include <private/qv4calldata_p.h>
 
 #include <QtQml/qqmlerror.h>
 

src/qml/compiler/qv4instr_moth.cpp

@@ -39,7 +39,7 @@
 
 #include "qv4instr_moth_p.h"
 #include <private/qv4compileddata_p.h>
-#include <private/qv4stackframe_p.h>
+#include <private/qv4calldata_p.h>
 
 using namespace QV4;
 using namespace QV4::Moth;

src/qml/jsruntime/jsruntime.pri

@@ -143,6 +143,7 @@ qtConfig(qml-sequence-object) {
 
 
 HEADERS += \
+    $$PWD/qv4calldata_p.h \
     $$PWD/qv4runtime_p.h \
     $$PWD/qv4runtimeapi_p.h \
     $$PWD/qv4value_p.h \

src/qml/jsruntime/qv4calldata_p.h

@@ -0,0 +1,113 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 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: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 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 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#ifndef QV4CALLDATA_P_H
+#define QV4CALLDATA_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <private/qv4value_p.h>
+
+QT_BEGIN_NAMESPACE
+
+namespace QV4 {
+
+struct CallData
+{
+    enum Offsets {
+        Function = 0,
+        Context = 1,
+        Accumulator = 2,
+        This = 3,
+        NewTarget = 4,
+        Argc = 5,
+
+        LastOffset = Argc,
+        OffsetCount = LastOffset + 1
+    };
+
+    Value function;
+    Value context;
+    Value accumulator;
+    Value thisObject;
+    Value newTarget;
+    Value _argc;
+
+    int argc() const {
+        Q_ASSERT(_argc.isInteger());
+        return _argc.int_32();
+    }
+
+    void setArgc(int argc) {
+        Q_ASSERT(argc >= 0);
+        _argc.setInt_32(argc);
+    }
+
+    inline ReturnedValue argument(int i) const {
+        return i < argc() ? args[i].asReturnedValue() : Value::undefinedValue().asReturnedValue();
+    }
+
+    Value args[1];
+
+    static Q_DECL_CONSTEXPR int HeaderSize() { return offsetof(CallData, args) / sizeof(QV4::Value); }
+};
+
+Q_STATIC_ASSERT(std::is_standard_layout<CallData>::value);
+Q_STATIC_ASSERT(offsetof(CallData, function   ) == CallData::Function    * sizeof(Value));
+Q_STATIC_ASSERT(offsetof(CallData, context    ) == CallData::Context     * sizeof(Value));
+Q_STATIC_ASSERT(offsetof(CallData, accumulator) == CallData::Accumulator * sizeof(Value));
+Q_STATIC_ASSERT(offsetof(CallData, thisObject ) == CallData::This        * sizeof(Value));
+Q_STATIC_ASSERT(offsetof(CallData, newTarget  ) == CallData::NewTarget   * sizeof(Value));
+Q_STATIC_ASSERT(offsetof(CallData, _argc      ) == CallData::Argc        * sizeof(Value));
+Q_STATIC_ASSERT(offsetof(CallData, args       ) == 6 * sizeof(Value));
+
+} // namespace QV4
+
+QT_END_NAMESPACE
+
+#endif // QV4CALLDATA_P_H

src/qml/jsruntime/qv4stackframe_p.h

@@ -52,6 +52,7 @@
 
 #include <private/qv4context_p.h>
 #include <private/qv4enginebase_p.h>
+#include <private/qv4calldata_p.h>
 #ifndef V4_BOOTSTRAP
 #include <private/qv4function_p.h>
 #endif
@@ -60,55 +61,6 @@ QT_BEGIN_NAMESPACE
 
 namespace QV4 {
 
-struct CallData
-{
-    enum Offsets {
-        Function = 0,
-        Context = 1,
-        Accumulator = 2,
-        This = 3,
-        NewTarget = 4,
-        Argc = 5,
-
-        LastOffset = Argc,
-        OffsetCount = LastOffset + 1
-    };
-
-    Value function;
-    Value context;
-    Value accumulator;
-    Value thisObject;
-    Value newTarget;
-    Value _argc;
-
-    int argc() const {
-        Q_ASSERT(_argc.isInteger());
-        return _argc.int_32();
-    }
-
-    void setArgc(int argc) {
-        Q_ASSERT(argc >= 0);
-        _argc.setInt_32(argc);
-    }
-
-    inline ReturnedValue argument(int i) const {
-        return i < argc() ? args[i].asReturnedValue() : Value::undefinedValue().asReturnedValue();
-    }
-
-    Value args[1];
-
-    static Q_DECL_CONSTEXPR int HeaderSize() { return offsetof(CallData, args) / sizeof(QV4::Value); }
-};
-
-Q_STATIC_ASSERT(std::is_standard_layout<CallData>::value);
-Q_STATIC_ASSERT(offsetof(CallData, function   ) == CallData::Function    * sizeof(Value));
-Q_STATIC_ASSERT(offsetof(CallData, context    ) == CallData::Context     * sizeof(Value));
-Q_STATIC_ASSERT(offsetof(CallData, accumulator) == CallData::Accumulator * sizeof(Value));
-Q_STATIC_ASSERT(offsetof(CallData, thisObject ) == CallData::This        * sizeof(Value));
-Q_STATIC_ASSERT(offsetof(CallData, newTarget  ) == CallData::NewTarget   * sizeof(Value));
-Q_STATIC_ASSERT(offsetof(CallData, _argc      ) == CallData::Argc        * sizeof(Value));
-Q_STATIC_ASSERT(offsetof(CallData, args       ) == 6 * sizeof(Value));
-
 struct Q_QML_EXPORT CppStackFrame {
     EngineBase *engine;
     Value *savedStackTop;