diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:28:15 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:28:15 +0100 |
| commit | be428b21b777a04a1766adb880cb44e7b0b68e5a (patch) | |
| tree | 765bf1ad59a03935e8f87e8efc304f252d38ad52 /examples | |
| parent | 7cc50e972b7fa546f7cedff2ef19db20af9e36ab (diff) | |
| parent | f8137c81d38dc05f333afeaffc0f46a38a1e2f06 (diff) | |
| download | qtsvg-be428b21b777a04a1766adb880cb44e7b0b68e5a.tar.gz | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: I9244a68bf4709fa136c52132a66d70d7c0b8897b
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/svg/embedded/embedded.pro | 2 | ||||
| -rw-r--r-- | examples/svg/network/bearercloud/bearercloud.pro | 1 | ||||
| -rw-r--r-- | examples/svg/network/network.pro | 3 |
3 files changed, 3 insertions, 3 deletions
diff --git a/examples/svg/embedded/embedded.pro b/examples/svg/embedded/embedded.pro index aebb72b..3284881 100644 --- a/examples/svg/embedded/embedded.pro +++ b/examples/svg/embedded/embedded.pro @@ -2,4 +2,4 @@ TEMPLATE = subdirs qtHaveModule(widgets): SUBDIRS += desktopservices fluidlauncher weatherinfo # Disable platforms without process support -uikit|winrt: SUBDIRS -= fluidlauncher +!qtConfig(process): SUBDIRS -= fluidlauncher diff --git a/examples/svg/network/bearercloud/bearercloud.pro b/examples/svg/network/bearercloud/bearercloud.pro index 723c8c7..f69780b 100644 --- a/examples/svg/network/bearercloud/bearercloud.pro +++ b/examples/svg/network/bearercloud/bearercloud.pro @@ -10,6 +10,7 @@ RESOURCES = icons.qrc TARGET = bearercloud QT = core gui widgets network svg +requires(qtConfig(bearermanagement)) CONFIG += console diff --git a/examples/svg/network/network.pro b/examples/svg/network/network.pro index 0b87d29..4f5c4cf 100644 --- a/examples/svg/network/network.pro +++ b/examples/svg/network/network.pro @@ -1,3 +1,2 @@ TEMPLATE = subdirs -load(qfeatures) -qtHaveModule(widgets):!contains(QT_DISABLED_FEATURES, bearermanagement): SUBDIRS += bearercloud +qtHaveModule(widgets):qtHaveModule(network): SUBDIRS += bearercloud |