diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-05-04 11:38:59 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-05-04 11:38:59 +0200 |
| commit | 01285af37aafa00a1bf3fbd7654b1ec5e057775d (patch) | |
| tree | b3c421716c3bc6892b565a096a8ec5be837cd267 /src/plugins | |
| parent | 16f58282bc5a1f81f7346ac6560df68761ad277d (diff) | |
| parent | dbbcc4dff099d5cf41a3253f922b785889e17545 (diff) | |
Merge branch 'master' into qtquick2
Conflicts:
src/imports/particles/particles.pro
Diffstat (limited to 'src/plugins')
| -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 6e365491ba..e5e28a4c38 100644 --- a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro +++ b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro @@ -1,7 +1,7 @@ load(qt_module) TARGET = qmldbg_tcp -QT += declarative network +QT += declarative-private network include($$QT_SOURCE_TREE/src/plugins/qpluginbase.pri) |