Don't embded qmldbg_tcp plugin to libQt5Qml in static build
authorPasi Petäjäjärvi <pasi.petajajarvi@digia.com>
Fri, 24 Oct 2014 08:31:38 +0000 (11:31 +0300)
committerJani Heikkinen <jani.heikkinen@theqtcompany.com>
Tue, 11 Nov 2014 10:11:48 +0000 (11:11 +0100)
Embedding qmldbg_tcp sources to libQt5Qml causes multipled
definitions of QTcpServerConnection symbols with static
build on Qt Quick 2 applications. Qmake can resolve
dependencies to static plugins applications use, so no
need to embed this to libQt5Qml.

Change-Id: I18c5e44b9ac3de4ef8be29cc5944de3527566b3c
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
src/qml/debugger/debugger.pri

index 2545c78..77a3ba6 100644 (file)
@@ -34,8 +34,3 @@ HEADERS += \
     $$PWD/qqmlprofiler_p.h
 
 INCLUDEPATH += $$PWD
-
-!contains(DEFINES, QT_QML_NO_DEBUGGER): static {
-    DEFINES += QML_DEBUGGER_EMBED
-    include(../../plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pri)
-}