aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@theqtcompany.com>2015-07-15 13:30:47 +0200
committerUlf Hermann <ulf.hermann@theqtcompany.com>2015-07-29 14:36:14 +0000
commit790f9ed4cae1a64075aed007ada3807514a705de (patch)
tree2c54e34e42bb170455b7e4c9eb429980f77e7140 /src/plugins
parent1d7d143d46dd15c66ea53974d114761304b32803 (diff)
Clean up project files for debug connections
Don't specify files that don't exist and remove the pri/pro distinction. The .pri files aren't included from anywhere else. Change-Id: I7d77e3db495d8256adbface20657d7632e0e5a10 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/qmltooling/qmldbg_local/qmldbg_local.pri14
-rw-r--r--src/plugins/qmltooling/qmldbg_local/qmldbg_local.pro11
-rw-r--r--src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pri14
-rw-r--r--src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro13
4 files changed, 21 insertions, 31 deletions
diff --git a/src/plugins/qmltooling/qmldbg_local/qmldbg_local.pri b/src/plugins/qmltooling/qmldbg_local/qmldbg_local.pri
deleted file mode 100644
index 7635523e9b..0000000000
--- a/src/plugins/qmltooling/qmldbg_local/qmldbg_local.pri
+++ /dev/null
@@ -1,14 +0,0 @@
-QT += core-private
-
-SOURCES += \
- $$PWD/qlocalclientconnection.cpp \
- $$PWD/../shared/qpacketprotocol.cpp
-
-HEADERS += \
- $$PWD/qlocalclientconnection.h \
- $$PWD/../shared/qpacketprotocol.h
-
-INCLUDEPATH += $$PWD \
- $$PWD/../shared
-
-OTHER_FILES += $$PWD/qlocalclientconnection.json
diff --git a/src/plugins/qmltooling/qmldbg_local/qmldbg_local.pro b/src/plugins/qmltooling/qmldbg_local/qmldbg_local.pro
index b060154933..3a38696c17 100644
--- a/src/plugins/qmltooling/qmldbg_local/qmldbg_local.pro
+++ b/src/plugins/qmltooling/qmldbg_local/qmldbg_local.pro
@@ -5,4 +5,13 @@ PLUGIN_TYPE = qmltooling
PLUGIN_CLASS_NAME = QLocalClientConnection
load(qt_plugin)
-include(qmldbg_local.pri)
+SOURCES += \
+ $$PWD/qlocalclientconnection.cpp \
+ $$PWD/../shared/qpacketprotocol.cpp
+
+HEADERS += \
+ $$PWD/qlocalclientconnection.h \
+ $$PWD/../shared/qpacketprotocol.h
+
+INCLUDEPATH += $$PWD \
+ $$PWD/../shared
diff --git a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pri b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pri
deleted file mode 100644
index 4b78707c3d..0000000000
--- a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pri
+++ /dev/null
@@ -1,14 +0,0 @@
-QT += network core-private
-
-SOURCES += \
- $$PWD/qtcpserverconnection.cpp \
- $$PWD/../shared/qpacketprotocol.cpp
-
-HEADERS += \
- $$PWD/qtcpserverconnection.h \
- $$PWD/../shared/qpacketprotocol.h
-
-INCLUDEPATH += $$PWD \
- $$PWD/../shared
-
-OTHER_FILES += $$PWD/qtcpserverconnection.json
diff --git a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro
index e1284b7233..5e3660e793 100644
--- a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro
+++ b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro
@@ -1,8 +1,17 @@
TARGET = qmldbg_tcp
-QT = qml-private core-private
+QT = qml-private core-private network
PLUGIN_TYPE = qmltooling
PLUGIN_CLASS_NAME = QTcpServerConnection
load(qt_plugin)
-include(qmldbg_tcp.pri)
+SOURCES += \
+ $$PWD/qtcpserverconnection.cpp \
+ $$PWD/../shared/qpacketprotocol.cpp
+
+HEADERS += \
+ $$PWD/qtcpserverconnection.h \
+ $$PWD/../shared/qpacketprotocol.h
+
+INCLUDEPATH += $$PWD \
+ $$PWD/../shared