From ae768911eec15d712f5ef452ff7bdc8124117b6a Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 29 Nov 2011 08:49:23 +0100 Subject: [PATCH] Fix linking of autotests on Windows. Partial revert of 94fc8750797ffd3ef867d0cdc7849492cfee2c23. All dependent modules need to be specified in the QT variable, except core and gui, which are there by default. Change-Id: Ie8ffed56de03a37da191772fa321ed162e44a50d Reviewed-by: Jason McDonald --- tests/auto/corelib/io/qdatastream/qdatastream.pro | 2 +- tests/auto/corelib/kernel/qabstractitemmodel/qabstractitemmodel.pro | 2 +- tests/auto/corelib/kernel/qeventloop/qeventloop.pro | 2 +- tests/auto/corelib/kernel/qitemmodel/qitemmodel.pro | 2 +- tests/auto/corelib/kernel/qmimedata/qmimedata.pro | 2 +- tests/auto/corelib/kernel/qpointer/qpointer.pro | 2 +- tests/auto/corelib/kernel/qsignalmapper/qsignalmapper.pro | 2 +- tests/auto/corelib/kernel/qtranslator/qtranslator.pro | 2 +- tests/auto/corelib/kernel/qvariant/qvariant.pro | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/auto/corelib/io/qdatastream/qdatastream.pro b/tests/auto/corelib/io/qdatastream/qdatastream.pro index 2214bdb..b8af1b4 100644 --- a/tests/auto/corelib/io/qdatastream/qdatastream.pro +++ b/tests/auto/corelib/io/qdatastream/qdatastream.pro @@ -1,6 +1,6 @@ CONFIG += testcase TARGET = tst_qdatastream -QT = gui widgets testlib +QT += widgets testlib SOURCES = tst_qdatastream.cpp wince* { diff --git a/tests/auto/corelib/kernel/qabstractitemmodel/qabstractitemmodel.pro b/tests/auto/corelib/kernel/qabstractitemmodel/qabstractitemmodel.pro index ba4435f..e778fef 100644 --- a/tests/auto/corelib/kernel/qabstractitemmodel/qabstractitemmodel.pro +++ b/tests/auto/corelib/kernel/qabstractitemmodel/qabstractitemmodel.pro @@ -1,6 +1,6 @@ CONFIG += testcase TARGET = tst_qabstractitemmodel -QT = widgets testlib +QT += widgets testlib mtdir = ../../../integrationtests/modeltest INCLUDEPATH += $$PWD/$${mtdir} diff --git a/tests/auto/corelib/kernel/qeventloop/qeventloop.pro b/tests/auto/corelib/kernel/qeventloop/qeventloop.pro index 0fee018..d21a7d6 100644 --- a/tests/auto/corelib/kernel/qeventloop/qeventloop.pro +++ b/tests/auto/corelib/kernel/qeventloop/qeventloop.pro @@ -1,6 +1,6 @@ CONFIG += testcase TARGET = tst_qeventloop -QT = network testlib +QT = core network testlib SOURCES = tst_qeventloop.cpp win32:!wince*:LIBS += -luser32 diff --git a/tests/auto/corelib/kernel/qitemmodel/qitemmodel.pro b/tests/auto/corelib/kernel/qitemmodel/qitemmodel.pro index 89e0129..9df1364 100644 --- a/tests/auto/corelib/kernel/qitemmodel/qitemmodel.pro +++ b/tests/auto/corelib/kernel/qitemmodel/qitemmodel.pro @@ -1,6 +1,6 @@ CONFIG += testcase TARGET = tst_qitemmodel -QT = widgets sql testlib +QT += widgets sql testlib SOURCES = tst_qitemmodel.cpp # NOTE: The deployment of the sqldrivers is disabled on purpose. diff --git a/tests/auto/corelib/kernel/qmimedata/qmimedata.pro b/tests/auto/corelib/kernel/qmimedata/qmimedata.pro index 30b4e66..502ec78 100644 --- a/tests/auto/corelib/kernel/qmimedata/qmimedata.pro +++ b/tests/auto/corelib/kernel/qmimedata/qmimedata.pro @@ -1,4 +1,4 @@ CONFIG += testcase TARGET = tst_qmimedata -QT = gui testlib +QT += testlib SOURCES = tst_qmimedata.cpp diff --git a/tests/auto/corelib/kernel/qpointer/qpointer.pro b/tests/auto/corelib/kernel/qpointer/qpointer.pro index db1a75c..c5d96b4 100644 --- a/tests/auto/corelib/kernel/qpointer/qpointer.pro +++ b/tests/auto/corelib/kernel/qpointer/qpointer.pro @@ -1,4 +1,4 @@ CONFIG += testcase TARGET = tst_qpointer -QT = widgets testlib +QT += widgets testlib SOURCES = tst_qpointer.cpp diff --git a/tests/auto/corelib/kernel/qsignalmapper/qsignalmapper.pro b/tests/auto/corelib/kernel/qsignalmapper/qsignalmapper.pro index 5ec67cd..d7a2532 100644 --- a/tests/auto/corelib/kernel/qsignalmapper/qsignalmapper.pro +++ b/tests/auto/corelib/kernel/qsignalmapper/qsignalmapper.pro @@ -1,4 +1,4 @@ CONFIG += testcase TARGET = tst_qsignalmapper -QT = widgets testlib +QT += widgets testlib SOURCES = tst_qsignalmapper.cpp diff --git a/tests/auto/corelib/kernel/qtranslator/qtranslator.pro b/tests/auto/corelib/kernel/qtranslator/qtranslator.pro index 603b128..f44be7d 100644 --- a/tests/auto/corelib/kernel/qtranslator/qtranslator.pro +++ b/tests/auto/corelib/kernel/qtranslator/qtranslator.pro @@ -1,6 +1,6 @@ CONFIG += testcase TARGET = tst_qtranslator -QT = widgets testlib +QT += widgets testlib SOURCES = tst_qtranslator.cpp RESOURCES += qtranslator.qrc diff --git a/tests/auto/corelib/kernel/qvariant/qvariant.pro b/tests/auto/corelib/kernel/qvariant/qvariant.pro index bc0a4d4..93877a1 100644 --- a/tests/auto/corelib/kernel/qvariant/qvariant.pro +++ b/tests/auto/corelib/kernel/qvariant/qvariant.pro @@ -1,6 +1,6 @@ CONFIG += testcase TARGET = tst_qvariant -QT = widgets network testlib +QT += widgets network testlib SOURCES = tst_qvariant.cpp mac: CONFIG += insignificant_test # QTBUG-QTBUG-22747 -- 2.7.4