diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-04-11 14:36:55 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-04-11 14:36:55 +0200 |
| commit | 98d3e40fb7c88b670a93e73dace2d0f05a5f903c (patch) | |
| tree | b1292124a86c219fb434db4ec28e8f805ff52287 /tests/auto/other/qcomplextext/qcomplextext.pro | |
| parent | a74e4b85be83e2da47f4a1d8fcf0e78079335b80 (diff) | |
| parent | bab494e4d046f5617d19f5fec35eeff94377c51f (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
mkspecs/qnx-armv7le-qcc/qplatformdefs.h
src/printsupport/kernel/qcups.cpp
src/widgets/styles/qstyle.h
tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp
Change-Id: Ia41e13051169a6d4a8a1267548e7d47b859bb267
Diffstat (limited to 'tests/auto/other/qcomplextext/qcomplextext.pro')
| -rw-r--r-- | tests/auto/other/qcomplextext/qcomplextext.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/other/qcomplextext/qcomplextext.pro b/tests/auto/other/qcomplextext/qcomplextext.pro index 7848028134..28acc397bf 100644 --- a/tests/auto/other/qcomplextext/qcomplextext.pro +++ b/tests/auto/other/qcomplextext/qcomplextext.pro @@ -1,7 +1,7 @@ CONFIG += testcase CONFIG += parallel_test TARGET = tst_qcomplextext -QT += widgets widgets-private testlib +QT += testlib QT += core-private gui-private SOURCES += tst_qcomplextext.cpp DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 |