diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-22 15:04:42 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-22 15:32:19 +0200 |
| commit | 07782f48f4318a7261f1b0ddcd686b19ec812e36 (patch) | |
| tree | 3fa2aa3a1170ad7ebaf5b1641cdce19a941ca480 /src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro | |
| parent | 50fcdfd705c2ad9560641986bf4152b017ee8bb6 (diff) | |
| parent | f15a90e5d10465e66698209a5d88f1e63ae336fa (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
src/qml/qml/qqmlbinding.cpp
src/qml/jsruntime/qv4arraybuffer.cpp
src/qml/jsruntime/qv4functionobject.cpp
Change-Id: Ic752e9dfd69b282093651c9234c110a49762f06d
Diffstat (limited to 'src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro')
| -rw-r--r-- | src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro index e9dba5fdaf..e1284b7233 100644 --- a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro +++ b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro @@ -1,5 +1,5 @@ TARGET = qmldbg_tcp -QT = qml-private +QT = qml-private core-private PLUGIN_TYPE = qmltooling PLUGIN_CLASS_NAME = QTcpServerConnection |