diff options
Diffstat (limited to 'src/declarative/debugger')
8 files changed, 41 insertions, 29 deletions
diff --git a/src/declarative/debugger/qdeclarativedebug_p.h b/src/declarative/debugger/qdeclarativedebug_p.h index 3d83e8a..9b8572b 100644 --- a/src/declarative/debugger/qdeclarativedebug_p.h +++ b/src/declarative/debugger/qdeclarativedebug_p.h @@ -45,6 +45,8 @@ #include <QtCore/qurl.h> #include <QtCore/qvariant.h> +#include <private/qdeclarativeglobal_p.h> + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -65,7 +67,7 @@ class QDeclarativeDebugObjectReference; class QDeclarativeDebugFileReference; class QDeclarativeDebugEngineReference; class QDeclarativeEngineDebugPrivate; -class Q_DECLARATIVE_EXPORT QDeclarativeEngineDebug : public QObject +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeEngineDebug : public QObject { Q_OBJECT public: @@ -111,7 +113,7 @@ private: Q_DECLARE_PRIVATE(QDeclarativeEngineDebug) }; -class Q_DECLARATIVE_EXPORT QDeclarativeDebugWatch : public QObject +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugWatch : public QObject { Q_OBJECT public: @@ -142,7 +144,7 @@ private: int m_objectDebugId; }; -class Q_DECLARATIVE_EXPORT QDeclarativeDebugPropertyWatch : public QDeclarativeDebugWatch +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugPropertyWatch : public QDeclarativeDebugWatch { Q_OBJECT public: @@ -155,7 +157,7 @@ private: QString m_name; }; -class Q_DECLARATIVE_EXPORT QDeclarativeDebugObjectExpressionWatch : public QDeclarativeDebugWatch +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugObjectExpressionWatch : public QDeclarativeDebugWatch { Q_OBJECT public: @@ -170,7 +172,7 @@ private: }; -class Q_DECLARATIVE_EXPORT QDeclarativeDebugQuery : public QObject +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugQuery : public QObject { Q_OBJECT public: @@ -194,7 +196,7 @@ private: State m_state; }; -class Q_DECLARATIVE_EXPORT QDeclarativeDebugFileReference +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugFileReference { public: QDeclarativeDebugFileReference(); @@ -215,7 +217,7 @@ private: int m_columnNumber; }; -class Q_DECLARATIVE_EXPORT QDeclarativeDebugEngineReference +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugEngineReference { public: QDeclarativeDebugEngineReference(); @@ -232,7 +234,7 @@ private: QString m_name; }; -class Q_DECLARATIVE_EXPORT QDeclarativeDebugObjectReference +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugObjectReference { public: QDeclarativeDebugObjectReference(); @@ -263,7 +265,7 @@ private: QList<QDeclarativeDebugObjectReference> m_children; }; -class Q_DECLARATIVE_EXPORT QDeclarativeDebugContextReference +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugContextReference { public: QDeclarativeDebugContextReference(); @@ -284,7 +286,7 @@ private: QList<QDeclarativeDebugContextReference> m_contexts; }; -class Q_DECLARATIVE_EXPORT QDeclarativeDebugPropertyReference +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugPropertyReference { public: QDeclarativeDebugPropertyReference(); @@ -309,7 +311,7 @@ private: }; -class Q_DECLARATIVE_EXPORT QDeclarativeDebugEnginesQuery : public QDeclarativeDebugQuery +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugEnginesQuery : public QDeclarativeDebugQuery { Q_OBJECT public: @@ -324,7 +326,7 @@ private: QList<QDeclarativeDebugEngineReference> m_engines; }; -class Q_DECLARATIVE_EXPORT QDeclarativeDebugRootContextQuery : public QDeclarativeDebugQuery +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugRootContextQuery : public QDeclarativeDebugQuery { Q_OBJECT public: @@ -339,7 +341,7 @@ private: QDeclarativeDebugContextReference m_context; }; -class Q_DECLARATIVE_EXPORT QDeclarativeDebugObjectQuery : public QDeclarativeDebugQuery +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugObjectQuery : public QDeclarativeDebugQuery { Q_OBJECT public: @@ -355,7 +357,7 @@ private: }; -class Q_DECLARATIVE_EXPORT QDeclarativeDebugExpressionQuery : public QDeclarativeDebugQuery +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugExpressionQuery : public QDeclarativeDebugQuery { Q_OBJECT public: diff --git a/src/declarative/debugger/qdeclarativedebugclient.cpp b/src/declarative/debugger/qdeclarativedebugclient.cpp index 977e58e..f5c5751 100644 --- a/src/declarative/debugger/qdeclarativedebugclient.cpp +++ b/src/declarative/debugger/qdeclarativedebugclient.cpp @@ -93,7 +93,7 @@ QDeclarativeDebugConnectionPrivate::QDeclarativeDebugConnectionPrivate(QDeclarat void QDeclarativeDebugConnectionPrivate::advertisePlugins() { - if (!q->isConnected() || !gotHello) + if (!q->isConnected()) return; QPacket pack; diff --git a/src/declarative/debugger/qdeclarativedebugclient_p.h b/src/declarative/debugger/qdeclarativedebugclient_p.h index 8d1706d..47f87a5 100644 --- a/src/declarative/debugger/qdeclarativedebugclient_p.h +++ b/src/declarative/debugger/qdeclarativedebugclient_p.h @@ -44,6 +44,8 @@ #include <QtNetwork/qtcpsocket.h> +#include <private/qdeclarativeglobal_p.h> + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -51,7 +53,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) class QDeclarativeDebugConnectionPrivate; -class Q_DECLARATIVE_EXPORT QDeclarativeDebugConnection : public QTcpSocket +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugConnection : public QTcpSocket { Q_OBJECT Q_DISABLE_COPY(QDeclarativeDebugConnection) @@ -67,7 +69,7 @@ private: }; class QDeclarativeDebugClientPrivate; -class Q_DECLARATIVE_EXPORT QDeclarativeDebugClient : public QObject +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugClient : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QDeclarativeDebugClient) diff --git a/src/declarative/debugger/qdeclarativedebuggerstatus_p.h b/src/declarative/debugger/qdeclarativedebuggerstatus_p.h index a3ba40a..a1499d8 100644 --- a/src/declarative/debugger/qdeclarativedebuggerstatus_p.h +++ b/src/declarative/debugger/qdeclarativedebuggerstatus_p.h @@ -44,13 +44,15 @@ #include <QtCore/qobject.h> +#include <private/qdeclarativeglobal_p.h> + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE QT_MODULE(Declarative) -class Q_DECLARATIVE_EXPORT QDeclarativeDebuggerStatus +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebuggerStatus { public: virtual ~QDeclarativeDebuggerStatus(); diff --git a/src/declarative/debugger/qdeclarativedebughelper_p.h b/src/declarative/debugger/qdeclarativedebughelper_p.h index c9cb839..5689dff 100644 --- a/src/declarative/debugger/qdeclarativedebughelper_p.h +++ b/src/declarative/debugger/qdeclarativedebughelper_p.h @@ -44,6 +44,8 @@ #include <QtCore/qglobal.h> +#include <private/qdeclarativeglobal_p.h> + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -53,7 +55,7 @@ class QDeclarativeEngine; // Helper methods to access private API through a stable interface // This is used in the qmljsdebugger library of QtCreator. -class Q_DECLARATIVE_EXPORT QDeclarativeDebugHelper +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugHelper { public: static QScriptEngine *getScriptEngine(QDeclarativeEngine *engine); diff --git a/src/declarative/debugger/qdeclarativedebugservice.cpp b/src/declarative/debugger/qdeclarativedebugservice.cpp index b98cd5d..c39da3d 100644 --- a/src/declarative/debugger/qdeclarativedebugservice.cpp +++ b/src/declarative/debugger/qdeclarativedebugservice.cpp @@ -204,13 +204,13 @@ QDeclarativeDebugServer *QDeclarativeDebugServer::instance() bool ok = false; // format: qmljsdebugger=port:3768[,block] - if (!appD->qmljsDebugArguments.isEmpty()) { + if (!appD->qmljsDebugArgumentsString().isEmpty()) { - if (appD->qmljsDebugArguments.indexOf(QLatin1String("port:")) == 0) { - int separatorIndex = appD->qmljsDebugArguments.indexOf(QLatin1Char(',')); - port = appD->qmljsDebugArguments.mid(5, separatorIndex - 5).toInt(&ok); + if (appD->qmljsDebugArgumentsString().indexOf(QLatin1String("port:")) == 0) { + int separatorIndex = appD->qmljsDebugArgumentsString().indexOf(QLatin1Char(',')); + port = appD->qmljsDebugArgumentsString().mid(5, separatorIndex - 5).toInt(&ok); } - block = appD->qmljsDebugArguments.contains(QLatin1String("block")); + block = appD->qmljsDebugArgumentsString().contains(QLatin1String("block")); if (ok) { server = new QDeclarativeDebugServer(port); @@ -221,7 +221,7 @@ QDeclarativeDebugServer *QDeclarativeDebugServer::instance() } else { qWarning(QString::fromAscii("QDeclarativeDebugServer: Ignoring \"-qmljsdebugger=%1\". " "Format is -qmljsdebugger=port:<port>[,block]").arg( - appD->qmljsDebugArguments).toAscii().constData()); + appD->qmljsDebugArgumentsString()).toAscii().constData()); } } #endif diff --git a/src/declarative/debugger/qdeclarativedebugservice_p.h b/src/declarative/debugger/qdeclarativedebugservice_p.h index 0cadbe5..da27b9a 100644 --- a/src/declarative/debugger/qdeclarativedebugservice_p.h +++ b/src/declarative/debugger/qdeclarativedebugservice_p.h @@ -44,6 +44,8 @@ #include <QtCore/qobject.h> +#include <private/qdeclarativeglobal_p.h> + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -51,7 +53,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) class QDeclarativeDebugServicePrivate; -class Q_DECLARATIVE_EXPORT QDeclarativeDebugService : public QObject +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugService : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QDeclarativeDebugService) diff --git a/src/declarative/debugger/qpacketprotocol_p.h b/src/declarative/debugger/qpacketprotocol_p.h index cfdce4e..d153833 100644 --- a/src/declarative/debugger/qpacketprotocol_p.h +++ b/src/declarative/debugger/qpacketprotocol_p.h @@ -45,6 +45,8 @@ #include <QtCore/qobject.h> #include <QtCore/qdatastream.h> +#include <private/qdeclarativeglobal_p.h> + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -57,7 +59,7 @@ class QPacket; class QPacketAutoSend; class QPacketProtocolPrivate; -class Q_DECLARATIVE_EXPORT QPacketProtocol : public QObject +class Q_DECLARATIVE_PRIVATE_EXPORT QPacketProtocol : public QObject { Q_OBJECT public: @@ -87,7 +89,7 @@ private: }; -class Q_DECLARATIVE_EXPORT QPacket : public QDataStream +class Q_DECLARATIVE_PRIVATE_EXPORT QPacket : public QDataStream { public: QPacket(); @@ -104,7 +106,7 @@ protected: QBuffer * buf; }; -class Q_DECLARATIVE_EXPORT QPacketAutoSend : public QPacket +class Q_DECLARATIVE_PRIVATE_EXPORT QPacketAutoSend : public QPacket { public: virtual ~QPacketAutoSend(); |