diff options
| author | Morten Johan Sørvig <morten.sorvig@qt.io> | 2018-03-08 17:05:14 +0100 |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@qt.io> | 2018-03-08 18:14:46 +0100 |
| commit | 5a7c33dece358090bc8fd3b84567d8bcb0e3b630 (patch) | |
| tree | f73931fd2416debfecced1676761aabe48d2f319 /src/plugins/platforms/platforms.pro | |
| parent | c9908423d33828b15e5ea97bb1ee8deb08f15673 (diff) | |
| parent | e5a6e9bb80fb2427228f70488b8839b4aa0b4261 (diff) | |
Merge remote-tracking branch 'gerrit/5.11' into HEAD
Change-Id: Id3a0e9482b35b5e4c79018e0c547d3c4ff48d9a5
Diffstat (limited to 'src/plugins/platforms/platforms.pro')
| -rw-r--r-- | src/plugins/platforms/platforms.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platforms/platforms.pro b/src/plugins/platforms/platforms.pro index 618ca500ba..17e617931b 100644 --- a/src/plugins/platforms/platforms.pro +++ b/src/plugins/platforms/platforms.pro @@ -1,7 +1,7 @@ TEMPLATE = subdirs QT_FOR_CONFIG += gui-private -android: SUBDIRS += android +android:!android-embedded: SUBDIRS += android !android: SUBDIRS += minimal @@ -36,7 +36,7 @@ qtConfig(directfb) { qtConfig(thread): qtConfig(linuxfb): SUBDIRS += linuxfb -qtConfig(vnc): SUBDIRS += vnc +qtHaveModule(network):qtConfig(vnc): SUBDIRS += vnc freebsd { SUBDIRS += bsdfb |