diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-12-18 08:37:31 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-12-18 08:37:31 +0100 |
| commit | beb65dcd79f8c354dab7bb4a8d08157bd9d69329 (patch) | |
| tree | 4632a0ff0df8462f8913f347042cf8378de03268 /tests/auto/network/access | |
| parent | 3fc1002489d5861d4f7cc2e1e8800881d6593c9d (diff) | |
| parent | e3288f246b44ba2b6d90b90eb99ab61f496d8d57 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/gui/painting/painting.pri
src/plugins/platforms/xcb/qxcbconnection.cpp
tests/auto/corelib/thread/qthreadstorage/qthreadstorage.pro
tests/auto/corelib/tools/qlocale/test/test.pro
tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
tools/configure/environment.cpp
Change-Id: I9c40f458b89b2c206de2d2c24e90b5f679c93495
Diffstat (limited to 'tests/auto/network/access')
| -rw-r--r-- | tests/auto/network/access/qnetworkreply/qnetworkreply.pro | 2 | ||||
| -rw-r--r-- | tests/auto/network/access/qnetworkreply/test/test.pro | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/network/access/qnetworkreply/qnetworkreply.pro b/tests/auto/network/access/qnetworkreply/qnetworkreply.pro index 7cb6fddbaf..bd10c77252 100644 --- a/tests/auto/network/access/qnetworkreply/qnetworkreply.pro +++ b/tests/auto/network/access/qnetworkreply/qnetworkreply.pro @@ -1,5 +1,5 @@ TEMPLATE = subdirs -!wince: SUBDIRS += echo +!winrt:!wince: SUBDIRS += echo test.depends += $$SUBDIRS SUBDIRS += test diff --git a/tests/auto/network/access/qnetworkreply/test/test.pro b/tests/auto/network/access/qnetworkreply/test/test.pro index b683f620df..772bb55990 100644 --- a/tests/auto/network/access/qnetworkreply/test/test.pro +++ b/tests/auto/network/access/qnetworkreply/test/test.pro @@ -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 |