diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-16 12:29:42 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-16 12:33:27 +0200 |
commit | 9c8edb91f2c6c7de8228e018dbd1ae7a656b3097 (patch) | |
tree | 717b1df74793af50bd6daaa6775b923a74b05063 /tests/auto/qml/debugger/qqmldebugservice | |
parent | 5870667929ac5f45805b1e1e656fec81b9b22337 (diff) | |
parent | 2b3c2339616680537145a9cc2e7567575add1abb (diff) |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
tests/auto/qml/debugger/qv4profilerservice/qv4profilerservice.pro
tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler.pro
Change-Id: I76d87e3df97ebdba902ca3d7488c1582eca2a83c
Diffstat (limited to 'tests/auto/qml/debugger/qqmldebugservice')
-rw-r--r-- | tests/auto/qml/debugger/qqmldebugservice/qqmldebugservice.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qml/debugger/qqmldebugservice/qqmldebugservice.pro b/tests/auto/qml/debugger/qqmldebugservice/qqmldebugservice.pro index 5879506a58..573e58d3a6 100644 --- a/tests/auto/qml/debugger/qqmldebugservice/qqmldebugservice.pro +++ b/tests/auto/qml/debugger/qqmldebugservice/qqmldebugservice.pro @@ -18,5 +18,5 @@ OTHER_FILES += \ DEFINES += QT_QML_DEBUG_NO_WARNING -QT += qml-private testlib gui-private +QT += qml-private testlib gui-private core-private DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 |