From fac14e459734936320003c3e593481c9cb6079e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pasi=20Pet=C3=A4j=C3=A4j=C3=A4rvi?=
<pasi.petajajarvi@digia.com>
Date: Fri, 24 Oct 2014 11:31:38 +0300
Subject: [PATCH] Don't embded qmldbg_tcp plugin to libQt5Qml in static build
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 | 5 -----
1 file changed, 5 deletions(-)
diff --git a/src/qml/debugger/debugger.pri b/src/qml/debugger/debugger.pri
index 2545c7836d..77a3ba6490 100644
--- a/src/qml/debugger/debugger.pri
+++ b/src/qml/debugger/debugger.pri
@@ -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)
-}
--
GitLab