From 1f901a170e041f7f08d624d8228aaac1ea88d70f Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Tue, 29 Jun 2010 11:17:09 +0200
Subject: [PATCH] Include the private QML api in qmljsprivateapi.h
---
.../qmljsinspector/qmljsclientproxy.cpp | 4 +--
src/plugins/qmljsinspector/qmljsclientproxy.h | 5 ++-
.../qmljsinspector/qmljsdebuggerclient.h | 2 +-
src/plugins/qmljsinspector/qmljsinspector.pro | 1 +
src/plugins/qmljsinspector/qmljsprivateapi.h | 35 +++++++++++++++++++
5 files changed, 40 insertions(+), 7 deletions(-)
create mode 100644 src/plugins/qmljsinspector/qmljsprivateapi.h
diff --git a/src/plugins/qmljsinspector/qmljsclientproxy.cpp b/src/plugins/qmljsinspector/qmljsclientproxy.cpp
index ae5c72996d9..9fb3cfdf596 100644
--- a/src/plugins/qmljsinspector/qmljsclientproxy.cpp
+++ b/src/plugins/qmljsinspector/qmljsclientproxy.cpp
@@ -28,12 +28,10 @@
**************************************************************************/
#include "qmljsclientproxy.h"
#include "qmljsdebuggerclient.h"
+#include "qmljsprivateapi.h"
#include <utils/qtcassert.h>
-#include <private/qdeclarativedebug_p.h>
-#include <private/qdeclarativedebugclient_p.h>
-
#include <QUrl>
#include <QAbstractSocket>
#include <QDebug>
diff --git a/src/plugins/qmljsinspector/qmljsclientproxy.h b/src/plugins/qmljsinspector/qmljsclientproxy.h
index 4f42c293202..b825fc8239e 100644
--- a/src/plugins/qmljsinspector/qmljsclientproxy.h
+++ b/src/plugins/qmljsinspector/qmljsclientproxy.h
@@ -30,9 +30,8 @@
#define QMLJSCLIENTPROXY_H
#include "qmljsinspectorplugin.h"
-
-#include <private/qdeclarativedebug_p.h>
-#include <QObject>
+#include "qmljsprivateapi.h"
+#include <QtCore/QObject>
QT_FORWARD_DECLARE_CLASS(QUrl)
QT_FORWARD_DECLARE_CLASS(QDeclarativeEngineDebug)
diff --git a/src/plugins/qmljsinspector/qmljsdebuggerclient.h b/src/plugins/qmljsinspector/qmljsdebuggerclient.h
index b77aa9f4263..8bf8ac589b7 100644
--- a/src/plugins/qmljsinspector/qmljsdebuggerclient.h
+++ b/src/plugins/qmljsinspector/qmljsdebuggerclient.h
@@ -29,11 +29,11 @@
#ifndef QMLJSDEBUGGERCLIENT_H
#define QMLJSDEBUGGERCLIENT_H
+#include "qmljsprivateapi.h"
#include <debugger/qml/qmlengine.h>
#include <debugger/stackframe.h>
#include <debugger/stackhandler.h>
#include <debugger/debuggerrunner.h>
-#include <private/qdeclarativedebugclient_p.h> // QML private API
namespace QmlJSInspector {
namespace Internal {
diff --git a/src/plugins/qmljsinspector/qmljsinspector.pro b/src/plugins/qmljsinspector/qmljsinspector.pro
index 67b65460fdb..1237cf590b4 100644
--- a/src/plugins/qmljsinspector/qmljsinspector.pro
+++ b/src/plugins/qmljsinspector/qmljsinspector.pro
@@ -9,6 +9,7 @@ include(../../private_headers.pri)
DEFINES += QMLJSINSPECTOR_LIBRARY
HEADERS += \
+qmljsprivateapi.h \
qmljsdebuggerclient.h \
qmljsinspector_global.h \
qmljsinspectorconstants.h \
diff --git a/src/plugins/qmljsinspector/qmljsprivateapi.h b/src/plugins/qmljsinspector/qmljsprivateapi.h
new file mode 100644
index 00000000000..1ee71d9022c
--- /dev/null
+++ b/src/plugins/qmljsinspector/qmljsprivateapi.h
@@ -0,0 +1,35 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+**
+**************************************************************************/
+#ifndef QMLJSPRIVATEAPI_H
+#define QMLJSPRIVATEAPI_H
+
+#include <private/qdeclarativedebug_p.h>
+#include <private/qdeclarativedebugclient_p.h>
+
+#endif // QMLJSPRIVATEAPI_H
--
GitLab