Commit 4cd119a9 authored by Kai Koehne's avatar Kai Koehne
Browse files

QmlJsDebugClient: Compile it as separate library

Should boost build times.

Change-Id: I35c9fd32d2df6dbdadf4d324eb87dbfb491e5ef2
Reviewed-on: http://codereview.qt.nokia.com/2673

Reviewed-by: default avatarQt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: default avatarChristiaan Janssen <christiaan.janssen@nokia.com>
parent bb41109b
......@@ -10,11 +10,12 @@ SUBDIRS = \
utils \
utils/process_stub.pro \
languageutils \
symbianutils \
cplusplus \
qmljs \
qmljsdebugclient \
glsl \
qmleditorwidgets \
symbianutils
qmleditorwidgets
# Windows: Compile Qt Creator CDB extension if Debugging tools can be detected.
win32 {
......
......@@ -32,12 +32,13 @@
#ifndef QDECLARATIVEDEBUGCLIENT_H
#define QDECLARATIVEDEBUGCLIENT_H
#include "qmljsdebugclient_global.h"
#include <QtNetwork/qtcpsocket.h>
namespace QmlJsDebugClient {
class QDeclarativeDebugConnectionPrivate;
class QDeclarativeDebugConnection : public QIODevice
class QMLJSDEBUGCLIENT_EXPORT QDeclarativeDebugConnection : public QIODevice
{
Q_OBJECT
......@@ -71,7 +72,7 @@ private:
};
class QDeclarativeDebugClientPrivate;
class QDeclarativeDebugClient : public QObject
class QMLJSDEBUGCLIENT_EXPORT QDeclarativeDebugClient : public QObject
{
Q_OBJECT
Q_DECLARE_PRIVATE(QDeclarativeDebugClient)
......
......@@ -32,6 +32,7 @@
#ifndef QDECLARATIVEDEBUG_H
#define QDECLARATIVEDEBUG_H
#include "qmljsdebugclient_global.h"
#include <QtCore/qobject.h>
#include <QtCore/qurl.h>
#include <QtCore/qvariant.h>
......@@ -53,7 +54,7 @@ class QDeclarativeDebugFileReference;
class QDeclarativeDebugEngineReference;
class QDeclarativeEngineDebugPrivate;
class QDeclarativeEngineDebug : public QObject
class QMLJSDEBUGCLIENT_EXPORT QDeclarativeEngineDebug : public QObject
{
Q_OBJECT
public:
......@@ -102,7 +103,7 @@ private:
QScopedPointer<QDeclarativeEngineDebugPrivate> d_ptr;
};
class QDeclarativeDebugWatch : public QObject
class QMLJSDEBUGCLIENT_EXPORT QDeclarativeDebugWatch : public QObject
{
Q_OBJECT
public:
......@@ -133,7 +134,7 @@ private:
int m_objectDebugId;
};
class QDeclarativeDebugPropertyWatch : public QDeclarativeDebugWatch
class QMLJSDEBUGCLIENT_EXPORT QDeclarativeDebugPropertyWatch : public QDeclarativeDebugWatch
{
Q_OBJECT
public:
......@@ -146,7 +147,7 @@ private:
QString m_name;
};
class QDeclarativeDebugObjectExpressionWatch : public QDeclarativeDebugWatch
class QMLJSDEBUGCLIENT_EXPORT QDeclarativeDebugObjectExpressionWatch : public QDeclarativeDebugWatch
{
Q_OBJECT
public:
......@@ -160,7 +161,7 @@ private:
int m_debugId;
};
class QDeclarativeDebugQuery : public QObject
class QMLJSDEBUGCLIENT_EXPORT QDeclarativeDebugQuery : public QObject
{
Q_OBJECT
public:
......@@ -182,7 +183,7 @@ private:
State m_state;
};
class QDeclarativeDebugFileReference
class QMLJSDEBUGCLIENT_EXPORT QDeclarativeDebugFileReference
{
public:
QDeclarativeDebugFileReference();
......@@ -203,7 +204,7 @@ private:
int m_columnNumber;
};
class QDeclarativeDebugEngineReference
class QMLJSDEBUGCLIENT_EXPORT QDeclarativeDebugEngineReference
{
public:
QDeclarativeDebugEngineReference();
......@@ -220,7 +221,7 @@ private:
QString m_name;
};
class QDeclarativeDebugObjectReference
class QMLJSDEBUGCLIENT_EXPORT QDeclarativeDebugObjectReference
{
public:
QDeclarativeDebugObjectReference();
......@@ -251,7 +252,7 @@ private:
QList<QDeclarativeDebugObjectReference> m_children;
};
class QDeclarativeDebugContextReference
class QMLJSDEBUGCLIENT_EXPORT QDeclarativeDebugContextReference
{
public:
QDeclarativeDebugContextReference();
......@@ -272,7 +273,7 @@ private:
QList<QDeclarativeDebugContextReference> m_contexts;
};
class QDeclarativeDebugPropertyReference
class QMLJSDEBUGCLIENT_EXPORT QDeclarativeDebugPropertyReference
{
public:
QDeclarativeDebugPropertyReference();
......@@ -297,7 +298,7 @@ private:
};
class QDeclarativeDebugEnginesQuery : public QDeclarativeDebugQuery
class QMLJSDEBUGCLIENT_EXPORT QDeclarativeDebugEnginesQuery : public QDeclarativeDebugQuery
{
Q_OBJECT
public:
......@@ -312,7 +313,7 @@ private:
QList<QDeclarativeDebugEngineReference> m_engines;
};
class QDeclarativeDebugRootContextQuery : public QDeclarativeDebugQuery
class QMLJSDEBUGCLIENT_EXPORT QDeclarativeDebugRootContextQuery : public QDeclarativeDebugQuery
{
Q_OBJECT
public:
......@@ -327,7 +328,7 @@ private:
QDeclarativeDebugContextReference m_context;
};
class QDeclarativeDebugObjectQuery : public QDeclarativeDebugQuery
class QMLJSDEBUGCLIENT_EXPORT QDeclarativeDebugObjectQuery : public QDeclarativeDebugQuery
{
Q_OBJECT
public:
......@@ -343,7 +344,7 @@ private:
};
class QDeclarativeDebugExpressionQuery : public QDeclarativeDebugQuery
class QMLJSDEBUGCLIENT_EXPORT QDeclarativeDebugExpressionQuery : public QDeclarativeDebugQuery
{
Q_OBJECT
public:
......
contains(CONFIG, dll) {
DEFINES += QMLJSDEBUGCLIENT_LIB
} else {
DEFINES += QMLJSDEBUGCLIENT_STATIC_LIB
}
## Input
HEADERS += \
../../libs/qmljsdebugclient/qdeclarativeenginedebug.h \
../../libs/qmljsdebugclient/qpacketprotocol.h \
../../libs/qmljsdebugclient/qdeclarativedebugclient.h
INCLUDEPATH += $$PWD/..
HEADERS += \
$$PWD/qdeclarativeenginedebug.h \
$$PWD/qpacketprotocol.h \
$$PWD/qdeclarativedebugclient.h \
$$PWD/qmljsdebugclient_global.h
SOURCES += \
../../libs/qmljsdebugclient/qdeclarativeenginedebug.cpp \
../../libs/qmljsdebugclient/qpacketprotocol.cpp \
../../libs/qmljsdebugclient/qdeclarativedebugclient.cpp
$$PWD/qdeclarativeenginedebug.cpp \
$$PWD/qpacketprotocol.cpp \
$$PWD/qdeclarativedebugclient.cpp
OTHER_FILES += \
$$PWD/qmljsdebugclient.pri \
$$PWD/qmljsdebugclient-lib.pri
include(../symbianutils/symbianutils.pri)
LIBS *= -l$$qtLibraryName(QmlJSDebugClient)
TEMPLATE = lib
CONFIG += dll
TARGET = QmlJSDebugClient
DEFINES += QMLJSDEBUGCLIENT_LIBRARY
include(../../qtcreatorlibrary.pri)
include(../symbianutils/symbianutils.pri)
include(qmljsdebugclient-lib.pri)
OTHER_FILES += \
qmljsdebugclient.pri \
qmljsdebugclient-lib.pri
/**************************************************************************
**
** This file is part of Qt Creator
**
** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
**
** Contact: Nokia Corporation (info@qt.nokia.com)
**
**
** GNU Lesser General Public License Usage
**
** 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.
**
** In addition, as a special exception, Nokia gives you certain additional
** rights. These rights are described in the Nokia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** Other Usage
**
** Alternatively, this file may be used in accordance with the terms and
** conditions contained in a signed written agreement between you and Nokia.
**
** If you have questions regarding the use of this file, please contact
** Nokia at info@qt.nokia.com.
**
**************************************************************************/
#ifndef QMLJSDEBUGCLIENT_GLOBAL_H
#define QMLJSDEBUGCLIENT_GLOBAL_H
#if defined(QMLJSDEBUGCLIENT_LIB)
# define QMLJSDEBUGCLIENT_EXPORT Q_DECL_EXPORT
#elif defined(QMLJSDEBUGCLIENT_STATIC_LIB)
# define QMLJSDEBUGCLIENT_EXPORT
#else
# define QMLJSDEBUGCLIENT_EXPORT Q_DECL_IMPORT
#endif
#endif // QMLJSDEBUGCLIENT_GLOBAL_H
include($$PWD/../../../libs/qmljsdebugclient/qmljsdebugclient-lib.pri)
include($$PWD/../../../libs/qmljsdebugclient/qmljsdebugclient.pri)
include($$PWD/../../../shared/json/json.pri)
DEFINES += JSON_INCLUDE_PRI
......
......@@ -33,7 +33,6 @@ qmljscontextcrumblepath.cpp \
qmljsinspectorsettings.cpp \
qmljspropertyinspector.cpp
include(../../libs/qmljsdebugclient/qmljsdebugclient-lib.pri)
include(../../../share/qtcreator/qml/qmljsdebugger/protocol/protocol.pri)
RESOURCES += qmljsinspector.qrc
......@@ -45,3 +44,4 @@ include(../../plugins/coreplugin/coreplugin.pri)
include(../../plugins/texteditor/texteditor.pri)
include(../../plugins/debugger/debugger.pri)
include(../../libs/utils/utils.pri)
include(../../libs/qmljsdebugclient/qmljsdebugclient.pri)
......@@ -9,7 +9,7 @@ include(../../plugins/analyzerbase/analyzerbase.pri)
include(../../plugins/qmlprojectmanager/qmlprojectmanager.pri)
include(../../plugins/qt4projectmanager/qt4projectmanager.pri)
include(../../plugins/remotelinux/remotelinux.pri)
include(../../libs/qmljsdebugclient/qmljsdebugclient-lib.pri)
include(../../libs/qmljsdebugclient/qmljsdebugclient.pri)
include(../../libs/extensionsystem/extensionsystem.pri)
QT += network script declarative
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment