diff options
| author | Rainer Keller <Rainer.Keller@qt.io> | 2017-07-19 09:36:30 +0200 |
|---|---|---|
| committer | Rainer Keller <Rainer.Keller@qt.io> | 2017-07-19 08:30:00 +0000 |
| commit | 7f9178d4c6378fe574376d9d0ce234fa5603124e (patch) | |
| tree | 12d9ea8fdc8156408c0c657a6b3206b032f483bf | |
| parent | 3df0b2b0aee9ce0a6150b113571e6b3f9f200b7d (diff) | |
Disable serviceframework for Boot to Qt
Tests fail and framework is not needed on this platform.
Change-Id: Ib16de91d0fa32a82bde9a613c4750a4845d29f42
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| -rw-r--r-- | src/imports/imports.pro | 4 | ||||
| -rw-r--r-- | src/src.pro | 4 | ||||
| -rw-r--r-- | src/tools/tools.pro | 2 | ||||
| -rw-r--r-- | tests/auto/auto.pro | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/imports/imports.pro b/src/imports/imports.pro index 579a1143..3100bb6b 100644 --- a/src/imports/imports.pro +++ b/src/imports/imports.pro @@ -1,5 +1,5 @@ TEMPLATE = subdirs !macx:!without-systeminfo: SUBDIRS += systeminfo -!without-publishsubscribe: SUBDIRS += publishsubscribe -!macx:!without-serviceframework: SUBDIRS += serviceframework +!boot2qt:!without-publishsubscribe: SUBDIRS += publishsubscribe +!macx:!boot2qt:!without-serviceframework: SUBDIRS += serviceframework diff --git a/src/src.pro b/src/src.pro index 56c96dc2..13f7128e 100644 --- a/src/src.pro +++ b/src/src.pro @@ -2,8 +2,8 @@ TEMPLATE = subdirs CONFIG += ordered !android: !ios: !blackberry: !wince { - !without-publishsubscribe: SUBDIRS += publishsubscribe - !macx:!without-serviceframework: SUBDIRS += serviceframework + !boot2qt:!without-publishsubscribe: SUBDIRS += publishsubscribe + !macx:!boot2qt:!without-serviceframework: SUBDIRS += serviceframework !macx:!without-systeminfo: SUBDIRS += systeminfo SUBDIRS += tools diff --git a/src/tools/tools.pro b/src/tools/tools.pro index 25fbab77..1d2d6035 100644 --- a/src/tools/tools.pro +++ b/src/tools/tools.pro @@ -1,2 +1,2 @@ TEMPLATE = subdirs -!macx:!without-serviceframework: SUBDIRS = servicefw sfwlisten +!macx:!boot2qt:!without-serviceframework: SUBDIRS = servicefw sfwlisten diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 28f8a3e3..abac877b 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -1,7 +1,7 @@ TEMPLATE = subdirs -!without-publishsubscribe: SUBDIRS += publishsubscribe -!macx:!without-serviceframework: SUBDIRS += serviceframework +!boot2qt:!without-publishsubscribe: SUBDIRS += publishsubscribe +!macx:!boot2qt:!without-serviceframework: SUBDIRS += serviceframework !macx:!without-systeminfo: SUBDIRS += systeminfo #SUBDIRS += cmake |