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/qqmldebugjs | |
| 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/qqmldebugjs')
| -rw-r--r-- | tests/auto/qml/debugger/qqmldebugjs/qqmldebugjs.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qml/debugger/qqmldebugjs/qqmldebugjs.pro b/tests/auto/qml/debugger/qqmldebugjs/qqmldebugjs.pro index eb5f17a55d..fb06df9c99 100644 --- a/tests/auto/qml/debugger/qqmldebugjs/qqmldebugjs.pro +++ b/tests/auto/qml/debugger/qqmldebugjs/qqmldebugjs.pro @@ -1,6 +1,6 @@ CONFIG += testcase TARGET = tst_qqmldebugjs -QT += qml testlib gui-private +QT += qml testlib gui-private core-private macx:CONFIG -= app_bundle SOURCES += tst_qqmldebugjs.cpp |