From e39f50154fc02bf81329dd5b1a04a8b52bd384df Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 29 Aug 2011 15:33:59 +0200 Subject: [PATCH] Tests: Add widgets module to profile. Ensure the right test macro is run. Change-Id: I84d58038f25b000c05fd52e8bda92e4484d53a6e Reviewed-on: http://codereview.qt.nokia.com/3805 Reviewed-by: Friedemann Kleint --- tests/auto/exceptionsafety_objects/exceptionsafety_objects.pro | 1 + tests/auto/lancelot/lancelot.pro | 2 +- tests/auto/macgui/macgui.pro | 2 +- tests/auto/macnativeevents/macnativeevents.pro | 2 +- tests/auto/qaccessibility/qaccessibility.pro | 1 + tests/auto/qaccessibility_mac/qaccessibility_mac.pro | 2 +- tests/auto/qdirectpainter/test/test.pro | 2 +- tests/auto/qglbuffer/qglbuffer.pro | 2 +- tests/auto/qglfunctions/qglfunctions.pro | 2 +- tests/auto/qgraphicslayout/qgraphicslayout.pro | 1 + tests/auto/qitemeditorfactory/qitemeditorfactory.pro | 1 + tests/auto/qitemselectionmodel/qitemselectionmodel.pro | 1 + tests/auto/qitemview/qitemview.pro | 1 + tests/auto/qmdiarea/qmdiarea.pro | 2 +- tests/auto/qmultiscreen/qmultiscreen.pro | 1 + .../qnetworkaccessmanager_and_qprogressdialog.pro | 2 +- tests/auto/qscroller/qscroller.pro | 1 + tests/auto/qsoftkeymanager/qsoftkeymanager.pro | 1 + tests/auto/qstatemachine/qstatemachine.pro | 2 +- tests/auto/qtouchevent/qtouchevent.pro | 2 +- tests/auto/qwsembedwidget/qwsembedwidget.pro | 1 + tests/auto/uiloader/uiloader/uiloader.pro | 2 +- 22 files changed, 22 insertions(+), 12 deletions(-) diff --git a/tests/auto/exceptionsafety_objects/exceptionsafety_objects.pro b/tests/auto/exceptionsafety_objects/exceptionsafety_objects.pro index 3f773c7..d09c349 100644 --- a/tests/auto/exceptionsafety_objects/exceptionsafety_objects.pro +++ b/tests/auto/exceptionsafety_objects/exceptionsafety_objects.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets HEADERS += oomsimulator.h 3rdparty/valgrind.h 3rdparty/memcheck.h SOURCES += tst_exceptionsafety_objects.cpp diff --git a/tests/auto/lancelot/lancelot.pro b/tests/auto/lancelot/lancelot.pro index 67fff1b..0b3901f 100644 --- a/tests/auto/lancelot/lancelot.pro +++ b/tests/auto/lancelot/lancelot.pro @@ -1,5 +1,5 @@ load(qttest_p4) -QT += xml +QT += xml widgets contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2):QT += opengl SOURCES += tst_lancelot.cpp \ diff --git a/tests/auto/macgui/macgui.pro b/tests/auto/macgui/macgui.pro index 8a57a8c..3fbe74f 100644 --- a/tests/auto/macgui/macgui.pro +++ b/tests/auto/macgui/macgui.pro @@ -7,7 +7,7 @@ INCLUDEPATH += . SOURCES += tst_macgui.cpp guitest.cpp HEADERS += guitest.h -QT = core-private gui-private +QT = core-private gui-private widgets requires(mac) diff --git a/tests/auto/macnativeevents/macnativeevents.pro b/tests/auto/macnativeevents/macnativeevents.pro index af34942..0a0f6c8 100644 --- a/tests/auto/macnativeevents/macnativeevents.pro +++ b/tests/auto/macnativeevents/macnativeevents.pro @@ -7,7 +7,7 @@ TEMPLATE = app DEPENDPATH += . INCLUDEPATH += . LIBS += -framework Carbon - +QT += widgets HEADERS += qnativeevents.h nativeeventlist.h expectedeventlist.h SOURCES += qnativeevents.cpp qnativeevents_mac.cpp SOURCES += expectedeventlist.cpp nativeeventlist.cpp diff --git a/tests/auto/qaccessibility/qaccessibility.pro b/tests/auto/qaccessibility/qaccessibility.pro index 75fd1e9..ae046cc 100644 --- a/tests/auto/qaccessibility/qaccessibility.pro +++ b/tests/auto/qaccessibility/qaccessibility.pro @@ -1,5 +1,6 @@ load(qttest_p4) requires(contains(QT_CONFIG,accessibility)) +QT += widgets SOURCES += tst_qaccessibility.cpp unix:!mac:LIBS+=-lm diff --git a/tests/auto/qaccessibility_mac/qaccessibility_mac.pro b/tests/auto/qaccessibility_mac/qaccessibility_mac.pro index 47f72d1..21b6225 100644 --- a/tests/auto/qaccessibility_mac/qaccessibility_mac.pro +++ b/tests/auto/qaccessibility_mac/qaccessibility_mac.pro @@ -18,6 +18,6 @@ exists($$(QTDIR)/tools/designer/src/lib/uilib/uilib.pri) { } else { CONFIG += uitools } -QT += xml +QT += xml widgets LIBS += -framework ApplicationServices -framework Carbon diff --git a/tests/auto/qdirectpainter/test/test.pro b/tests/auto/qdirectpainter/test/test.pro index 6d820b1..3621e11 100644 --- a/tests/auto/qdirectpainter/test/test.pro +++ b/tests/auto/qdirectpainter/test/test.pro @@ -1,5 +1,5 @@ load(qttest_p4) - +QT += widgets SOURCES += ../tst_qdirectpainter.cpp TARGET = ../tst_qdirectpainter diff --git a/tests/auto/qglbuffer/qglbuffer.pro b/tests/auto/qglbuffer/qglbuffer.pro index 5627d2d..48bd966 100644 --- a/tests/auto/qglbuffer/qglbuffer.pro +++ b/tests/auto/qglbuffer/qglbuffer.pro @@ -4,7 +4,7 @@ load(qttest_p4) requires(contains(QT_CONFIG,opengl)) -QT += opengl +QT += opengl widgets win32:!wince*: DEFINES += QT_NO_EGL diff --git a/tests/auto/qglfunctions/qglfunctions.pro b/tests/auto/qglfunctions/qglfunctions.pro index aa81547..9fe8de2 100644 --- a/tests/auto/qglfunctions/qglfunctions.pro +++ b/tests/auto/qglfunctions/qglfunctions.pro @@ -1,6 +1,6 @@ load(qttest_p4) requires(contains(QT_CONFIG,opengl)) -QT += opengl +QT += opengl widgets win32:!wince*: DEFINES += QT_NO_EGL diff --git a/tests/auto/qgraphicslayout/qgraphicslayout.pro b/tests/auto/qgraphicslayout/qgraphicslayout.pro index eafd213..ea176c9 100644 --- a/tests/auto/qgraphicslayout/qgraphicslayout.pro +++ b/tests/auto/qgraphicslayout/qgraphicslayout.pro @@ -3,6 +3,7 @@ ############################################################ load(qttest_p4) +QT += widgets SOURCES += tst_qgraphicslayout.cpp DEFINES += QT_USE_USING_NAMESPACE CONFIG += parallel_test diff --git a/tests/auto/qitemeditorfactory/qitemeditorfactory.pro b/tests/auto/qitemeditorfactory/qitemeditorfactory.pro index d589f4e..89bc944 100644 --- a/tests/auto/qitemeditorfactory/qitemeditorfactory.pro +++ b/tests/auto/qitemeditorfactory/qitemeditorfactory.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qitemeditorfactory.cpp diff --git a/tests/auto/qitemselectionmodel/qitemselectionmodel.pro b/tests/auto/qitemselectionmodel/qitemselectionmodel.pro index afc859e..c675a6e 100644 --- a/tests/auto/qitemselectionmodel/qitemselectionmodel.pro +++ b/tests/auto/qitemselectionmodel/qitemselectionmodel.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qitemselectionmodel.cpp diff --git a/tests/auto/qitemview/qitemview.pro b/tests/auto/qitemview/qitemview.pro index de2c328..dbdd461 100644 --- a/tests/auto/qitemview/qitemview.pro +++ b/tests/auto/qitemview/qitemview.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qitemview.cpp diff --git a/tests/auto/qmdiarea/qmdiarea.pro b/tests/auto/qmdiarea/qmdiarea.pro index e16c679..6a12152 100644 --- a/tests/auto/qmdiarea/qmdiarea.pro +++ b/tests/auto/qmdiarea/qmdiarea.pro @@ -1,6 +1,6 @@ load(qttest_p4) -QT += gui-private +QT += gui-private widgets INCLUDEPATH += . SOURCES += tst_qmdiarea.cpp diff --git a/tests/auto/qmultiscreen/qmultiscreen.pro b/tests/auto/qmultiscreen/qmultiscreen.pro index 30666d7..c4a983c 100644 --- a/tests/auto/qmultiscreen/qmultiscreen.pro +++ b/tests/auto/qmultiscreen/qmultiscreen.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qmultiscreen.cpp requires(embedded) diff --git a/tests/auto/qnetworkaccessmanager_and_qprogressdialog/qnetworkaccessmanager_and_qprogressdialog.pro b/tests/auto/qnetworkaccessmanager_and_qprogressdialog/qnetworkaccessmanager_and_qprogressdialog.pro index 378deba..e5afc35 100644 --- a/tests/auto/qnetworkaccessmanager_and_qprogressdialog/qnetworkaccessmanager_and_qprogressdialog.pro +++ b/tests/auto/qnetworkaccessmanager_and_qprogressdialog/qnetworkaccessmanager_and_qprogressdialog.pro @@ -1,6 +1,6 @@ load(qttest_p4) SOURCES += tst_qnetworkaccessmanager_and_qprogressdialog.cpp -QT += network +QT += network widgets symbian: TARGET.CAPABILITY = NetworkServices diff --git a/tests/auto/qscroller/qscroller.pro b/tests/auto/qscroller/qscroller.pro index 1c990dc..6daf0b3 100644 --- a/tests/auto/qscroller/qscroller.pro +++ b/tests/auto/qscroller/qscroller.pro @@ -1,5 +1,6 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qscroller.cpp CONFIG += insignificant_test diff --git a/tests/auto/qsoftkeymanager/qsoftkeymanager.pro b/tests/auto/qsoftkeymanager/qsoftkeymanager.pro index 61ed4dc..7032964 100644 --- a/tests/auto/qsoftkeymanager/qsoftkeymanager.pro +++ b/tests/auto/qsoftkeymanager/qsoftkeymanager.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qsoftkeymanager.cpp requires(symbian) diff --git a/tests/auto/qstatemachine/qstatemachine.pro b/tests/auto/qstatemachine/qstatemachine.pro index c038199..9d057eb 100644 --- a/tests/auto/qstatemachine/qstatemachine.pro +++ b/tests/auto/qstatemachine/qstatemachine.pro @@ -1,5 +1,5 @@ load(qttest_p4) QT += widgets -QT += core core-private gui +QT += core core-private gui widgets SOURCES += tst_qstatemachine.cpp diff --git a/tests/auto/qtouchevent/qtouchevent.pro b/tests/auto/qtouchevent/qtouchevent.pro index 8f6aa87..55f99b6 100644 --- a/tests/auto/qtouchevent/qtouchevent.pro +++ b/tests/auto/qtouchevent/qtouchevent.pro @@ -1,3 +1,3 @@ SOURCES=tst_qtouchevent.cpp TARGET=tst_qtouchevent -QT+=testlib +QT += testlib widgets diff --git a/tests/auto/qwsembedwidget/qwsembedwidget.pro b/tests/auto/qwsembedwidget/qwsembedwidget.pro index c34212b..640b52d 100644 --- a/tests/auto/qwsembedwidget/qwsembedwidget.pro +++ b/tests/auto/qwsembedwidget/qwsembedwidget.pro @@ -1,2 +1,3 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qwsembedwidget.cpp diff --git a/tests/auto/uiloader/uiloader/uiloader.pro b/tests/auto/uiloader/uiloader/uiloader.pro index b959d43..1262470 100644 --- a/tests/auto/uiloader/uiloader/uiloader.pro +++ b/tests/auto/uiloader/uiloader/uiloader.pro @@ -13,7 +13,7 @@ win32 { } } -QT += xml svg network +QT += widgets network wince*|symbian: { configuration.files = ../*.ini -- 2.7.4