1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compilation for WinRT

Browse Source 
TEST_HELPER_INSTALLS cannot be used on platforms with no
QProcess support.

Change-Id: I2a6a283d94ca4487fc628449c53fc37140dd291d
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
This commit is contained in:
Maurice Kalinowski 2015-12-08 14:22:19 +01:00
parent fd527592b7
commit acdd57cb43
19 changed files with 34 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/auto/corelib/global/qlogging/qlogging.pro
View File

@ -1,6 +1,6 @@
TEMPLATE = subdirs
CONFIG += ordered
SUBDIRS += \
app \
test
!winrt: SUBDIRS += app
SUBDIRS += test

2
tests/auto/corelib/global/qlogging/test/test.pro
View File

@ -7,5 +7,5 @@ QT = core testlib
SOURCES = ../tst_qlogging.cpp
DEFINES += QT_MESSAGELOGCONTEXT
TEST_HELPER_INSTALLS = ../app/app
!winrt: TEST_HELPER_INSTALLS = ../app/app
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0

6
tests/auto/corelib/kernel/qobject/qobject.pro
View File

@ -1,6 +1,6 @@
TEMPLATE = subdirs
CONFIG += ordered
SUBDIRS += \
signalbug \
test
!winrt: SUBDIRS+= signalbug
SUBDIRS += test

2
tests/auto/corelib/kernel/qobject/test/test.pro
View File

@ -4,5 +4,5 @@ TARGET = ../tst_qobject
QT = core-private network testlib
SOURCES = ../tst_qobject.cpp
TEST_HELPER_INSTALLS = ../signalbug/signalbug
!winrt: TEST_HELPER_INSTALLS = ../signalbug/signalbug
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0

4
tests/auto/corelib/thread/qthreadstorage/qthreadstorage.pro
View File

@ -1,5 +1,7 @@
TEMPLATE = subdirs
SUBDIRS = \
crashonexit \
test
!winrt: SUBDIRS += crashonexit
CONFIG += ordered parallel_test

2
tests/auto/corelib/thread/qthreadstorage/test/test.pro
View File

@ -5,6 +5,6 @@ CONFIG += console
QT = core testlib
SOURCES = ../tst_qthreadstorage.cpp
TEST_HELPER_INSTALLS = ../crashonexit/crashonexit
!winrt: TEST_HELPER_INSTALLS = ../crashonexit/crashonexit
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0

4
tests/auto/corelib/tools/qlocale/qlocale.pro
View File

@ -1,4 +1,4 @@
TEMPLATE = subdirs
SUBDIRS += test \
syslocaleapp
SUBDIRS += test
!winrt: SUBDIRS+=syslocaleapp

2
tests/auto/corelib/tools/qlocale/test/test.pro
View File

@ -14,7 +14,7 @@ win32 {
}
}
TEST_HELPER_INSTALLS = ../syslocaleapp/syslocaleapp
!winrt: TEST_HELPER_INSTALLS = ../syslocaleapp/syslocaleapp
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
blackberry:LIBS += -lpps

2
tests/auto/gui/kernel/qclipboard/qclipboard.pro
View File

@ -1,4 +1,4 @@
TEMPLATE = subdirs
SUBDIRS = copier paster
!winrt: SUBDIRS = copier paster
test.depends += $$SUBDIRS
SUBDIRS += test

2
tests/auto/gui/kernel/qclipboard/test/test.pro
View File

@ -15,6 +15,6 @@ wince* {
DEPLOYMENT += rsc reg_resource
}
TEST_HELPER_INSTALLS = \
!winrt: TEST_HELPER_INSTALLS = \
../copier/copier \
../paster/paster

2
tests/auto/network/access/qnetworkreply/qnetworkreply.pro
View File

@ -1,5 +1,5 @@
TEMPLATE = subdirs
!wince: SUBDIRS += echo
!winrt:!wince: SUBDIRS += echo
test.depends += $$SUBDIRS
SUBDIRS += test

2
tests/auto/network/access/qnetworkreply/test/test.pro
View File

@ -13,4 +13,4 @@ TESTDATA += ../empty ../rfc3252.txt ../resource ../bigfile ../*.jpg ../certs \
contains(QT_CONFIG,xcb): CONFIG+=insignificant_test # unstable, QTBUG-21102
win32:CONFIG += insignificant_test # QTBUG-24226
TEST_HELPER_INSTALLS = ../echo/echo
!winrt: TEST_HELPER_INSTALLS = ../echo/echo

2
tests/auto/network/bearer/qnetworksession/qnetworksession.pro
View File

@ -1,4 +1,4 @@
TEMPLATE = subdirs
SUBDIRS = lackey
!winrt:SUBDIRS = lackey
test.depends = $$SUBDIRS
SUBDIRS += test

2
tests/auto/network/bearer/qnetworksession/test/test.pro
View File

@ -15,4 +15,4 @@ CONFIG(debug_and_release) {
DESTDIR = ..
}
TEST_HELPER_INSTALLS = ../lackey/lackey
!winrt: TEST_HELPER_INSTALLS = ../lackey/lackey

4
tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
View File

@ -466,7 +466,9 @@ void tst_QSslSocket::constructing()
QCOMPARE(socket.peerAddress(), QHostAddress());
QVERIFY(socket.peerName().isEmpty());
QCOMPARE(socket.peerPort(), quint16(0));
#ifndef QT_NO_NETWORKPROXY
QCOMPARE(socket.proxy().type(), QNetworkProxy::DefaultProxy);
#endif
QCOMPARE(socket.readBufferSize(), qint64(0));
QCOMPARE(socket.socketDescriptor(), (qintptr)-1);
QCOMPARE(socket.socketType(), QAbstractSocket::TcpSocket);
@ -2187,6 +2189,7 @@ void tst_QSslSocket::disconnectFromHostWhenConnected()
void tst_QSslSocket::resetProxy()
{
#ifndef QT_NO_NETWORKPROXY
QFETCH_GLOBAL(bool, setProxy);
if (setProxy)
return;
@ -2226,6 +2229,7 @@ void tst_QSslSocket::resetProxy()
socket2.setProxy(goodProxy);
socket2.connectToHostEncrypted(QtNetworkSettings::serverName(), 443);
QVERIFY2(socket2.waitForConnected(10000), qPrintable(socket.errorString()));
#endif // QT_NO_NETWORKPROXY
}
void tst_QSslSocket::ignoreSslErrorsList_data()

2
tests/auto/testlib/selftests/selftests.pro
View File

@ -1,6 +1,6 @@
TEMPLATE = subdirs
include(selftests.pri)
!winrt: include(selftests.pri)
SUBDIRS = $$SUBPROGRAMS test

2
tests/auto/testlib/selftests/test/test.pro
View File

@ -16,5 +16,5 @@ win32 {
RESOURCES += ../selftests.qrc
include(../selftests.pri)
for(file, SUBPROGRAMS): TEST_HELPER_INSTALLS += "../$${file}/$${file}"
!winrt: for(file, SUBPROGRAMS): TEST_HELPER_INSTALLS += "../$${file}/$${file}"

2
tests/auto/widgets/kernel/qapplication/qapplication.pro
View File

@ -1,6 +1,6 @@
TEMPLATE = subdirs
SUBDIRS = desktopsettingsaware modal
!winrt: SUBDIRS = desktopsettingsaware modal
test.depends += $$SUBDIRS
SUBDIRS += test

9
tests/auto/widgets/kernel/qapplication/test/test.pro
View File

@ -9,7 +9,10 @@ TARGET = ../tst_qapplication
TESTDATA = ../test/test.pro ../tmp/README
SUBPROGRAMS = desktopsettingsaware modal
win32:!wince: SUBPROGRAMS += wincmdline
!winrt {
SUBPROGRAMS = desktopsettingsaware modal
win32:!wince: SUBPROGRAMS += wincmdline
for(file, SUBPROGRAMS): TEST_HELPER_INSTALLS += "../$${file}/$${file}"
}
for(file, SUBPROGRAMS): TEST_HELPER_INSTALLS += "../$${file}/$${file}"