diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-03-06 12:31:50 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-03-06 12:31:50 +0100 |
| commit | 2add2dbdaa9ff6ca6637ca22d6a9b7c7027751be (patch) | |
| tree | 585628b0ceacfbdef5b9661c4043b9f71dfe9b01 /tests/auto/other/other.pro | |
| parent | f792fed2ff519ffac1436e41e47cc0504d253a77 (diff) | |
| parent | 4eda22ea0db1fc571ae9f44a68825056e6245548 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
src/network/access/http2/hpacktable_p.h
Change-Id: Ie0c296667dfdebba84f4858056a1ac80c24ee7df
Diffstat (limited to 'tests/auto/other/other.pro')
| -rw-r--r-- | tests/auto/other/other.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/other/other.pro b/tests/auto/other/other.pro index 378750472d..c5426202e8 100644 --- a/tests/auto/other/other.pro +++ b/tests/auto/other/other.pro @@ -56,7 +56,7 @@ winrt|!qtHaveModule(gui)|!qtConfig(accessibility): SUBDIRS -= qaccessibility !qtConfig(process): SUBDIRS -= qprocess_and_guieventloop -!mac: SUBDIRS -= \ +!macos|!qtHaveModule(gui): SUBDIRS -= \ macgui \ macnativeevents \ macplist \ |