diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-09-11 13:26:11 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-09-11 15:05:21 +0000 |
| commit | 1410f2cf5c124bc3f17eb3b0221f3707aae49d91 (patch) | |
| tree | 09c8145f8e81326135296b68c5c3b9d74949781d | |
| parent | bef5bfe27bc4154cfc83150299d8b1df732f6bea (diff) | |
disable tools that don't make sense on iOS more sensiblyv5.12.0-alpha1
the primary method of doing that is via the -nomake tools machanism,
which is the default when cross-building.
amends 78df61b51.
Fixes: QTBUG-70454
Change-Id: I837d5d130c1295154dab5d0424da46dacbfe2a34
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
| -rw-r--r-- | examples/examples.pro | 9 | ||||
| -rw-r--r-- | src/src.pro | 7 |
2 files changed, 9 insertions, 7 deletions
diff --git a/examples/examples.pro b/examples/examples.pro index c00e041be..2003bc514 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -1,7 +1,8 @@ TEMPLATE = subdirs -qtHaveModule(widgets) { - SUBDIRS += linguist - !uikit: SUBDIRS += help designer uitools assistant -} +qtHaveModule(widgets): SUBDIRS += help designer linguist uitools assistant !qtConfig(process): SUBDIRS -= assistant designer + +qtNomakeTools( \ + assistant \ +) diff --git a/src/src.pro b/src/src.pro index 3fc48db96..79e1ba61a 100644 --- a/src/src.pro +++ b/src/src.pro @@ -3,7 +3,7 @@ TEMPLATE = subdirs qtHaveModule(widgets) { no-png { message("Some graphics-related tools are unavailable without PNG support") - } else: !uikit { + } else { SUBDIRS = assistant \ pixeltool \ designer @@ -18,12 +18,12 @@ SUBDIRS += linguist \ qtattributionsscanner qtConfig(library) { - if(!android|android_app):!uikit: SUBDIRS += qtplugininfo + !android|android_app: SUBDIRS += qtplugininfo } config_clang: qtConfig(thread): SUBDIRS += qdoc -if(!android|android_app):!uikit: SUBDIRS += qtpaths +!android|android_app: SUBDIRS += qtpaths macos { SUBDIRS += macdeployqt @@ -36,6 +36,7 @@ winrt:SUBDIRS += winrtrunner qtHaveModule(gui):!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag qtNomakeTools( \ + distancefieldgenerator \ pixeltool \ ) |