diff options
| author | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-09-16 13:23:19 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-10-15 08:23:15 +0000 |
| commit | 2f03049d4cabfac822bcf6b5886b078d70064968 (patch) | |
| tree | e79c7cdc5e300d8889d0525d0a3b1f5582921aa1 /tests/auto/qml/debugger/shared | |
| parent | 1a123472ba0e56d1fd772db430e6d4532f672a6e (diff) | |
Put QPacketProtocol into its own static library
We need it in 3 places in qtdeclarative and we could also use it in
QtCreator. We don't want to bundle it with the debug client code as it
is also necessary for the server.
QPacket replaces QQmlDebugStream as it has the same purpose. This
also fixes the inconsitent handling of data stream versions.
Change-Id: I650fae353f267511c551b427d9169f4d718aa7f2
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'tests/auto/qml/debugger/shared')
| -rw-r--r-- | tests/auto/qml/debugger/shared/debugutil.pri | 4 | ||||
| -rw-r--r-- | tests/auto/qml/debugger/shared/qqmldebugclient.cpp | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/tests/auto/qml/debugger/shared/debugutil.pri b/tests/auto/qml/debugger/shared/debugutil.pri index cb9c761395..73ed647061 100644 --- a/tests/auto/qml/debugger/shared/debugutil.pri +++ b/tests/auto/qml/debugger/shared/debugutil.pri @@ -1,8 +1,8 @@ +QT += packetprotocol-private + HEADERS += $$PWD/debugutil_p.h \ $$PWD/qqmldebugclient.h \ - $$PWD/../../../../../src/plugins/qmltooling/shared/qpacketprotocol.h SOURCES += $$PWD/debugutil.cpp \ $$PWD/qqmldebugclient.cpp \ - $$PWD/../../../../../src/plugins/qmltooling/shared/qpacketprotocol.cpp diff --git a/tests/auto/qml/debugger/shared/qqmldebugclient.cpp b/tests/auto/qml/debugger/shared/qqmldebugclient.cpp index f350614a47..00de8f9f7e 100644 --- a/tests/auto/qml/debugger/shared/qqmldebugclient.cpp +++ b/tests/auto/qml/debugger/shared/qqmldebugclient.cpp @@ -32,7 +32,9 @@ ****************************************************************************/ #include "qqmldebugclient.h" -#include "../../../../../src/plugins/qmltooling/shared/qpacketprotocol.h" + +#include <private/qpacketprotocol_p.h> +#include <private/qpacket_p.h> #include <QtCore/qdebug.h> #include <QtCore/qeventloop.h> @@ -138,7 +140,7 @@ void QQmlDebugConnectionPrivate::readyRead() QStringList pluginNames; QList<float> pluginVersions; pack >> pluginNames; - if (!pack.isEmpty()) + if (!pack.atEnd()) pack >> pluginVersions; const int pluginNamesSize = pluginNames.size(); @@ -192,7 +194,7 @@ void QQmlDebugConnectionPrivate::readyRead() QStringList pluginNames; QList<float> pluginVersions; pack >> pluginNames; - if (!pack.isEmpty()) + if (!pack.atEnd()) pack >> pluginVersions; const int pluginNamesSize = pluginNames.size(); |