diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-18 11:07:51 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-18 11:07:51 +0200 |
| commit | 0ca4fcbc36527ce02b604aa88e8bd0d37d40baf4 (patch) | |
| tree | 6adf165fb783272d720416a49a51d9ad169d16de /tests/auto/other/lancelot | |
| parent | 9aeaa363e533e1486e6e9d7526bbab7c2472be5e (diff) | |
| parent | 748aa6b06462804a9671997302df292ae9788d5c (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/plugins/platforms/xcb/qxcbintegration.cpp
Change-Id: I2d71d06a55f730df19ace0dd3304238584a0497f
Diffstat (limited to 'tests/auto/other/lancelot')
| -rw-r--r-- | tests/auto/other/lancelot/lancelot.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/other/lancelot/lancelot.pro b/tests/auto/other/lancelot/lancelot.pro index 6e79566649..e9c9af7143 100644 --- a/tests/auto/other/lancelot/lancelot.pro +++ b/tests/auto/other/lancelot/lancelot.pro @@ -1,7 +1,7 @@ CONFIG += testcase CONFIG -= app_bundle TARGET = tst_lancelot -QT += xml widgets testlib +QT += xml testlib SOURCES += tst_lancelot.cpp \ paintcommands.cpp |