From 8b5092054abf440e8b2100cf8638cc0ab0cc1b42 Mon Sep 17 00:00:00 2001
From: Norihito Tohge <norihito.tohge@qt.io>
Date: Wed, 18 Mar 2020 15:19:22 +0900
Subject: [PATCH] Make more things be built only on Desktop platforms
Change-Id: I27d127616fc52a01ea6818854a977aa758de424e
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
---
src/assetimport/assetimport.pro | 12 +++++++++---
src/plugins/assetimporters/assetimporters.pro | 11 ++++-------
src/plugins/plugins.pro | 5 ++++-
tests/auto/auto.pro | 5 ++++-
4 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/src/assetimport/assetimport.pro b/src/assetimport/assetimport.pro
index 17bc9a4dd..0e2c16ead 100644
--- a/src/assetimport/assetimport.pro
+++ b/src/assetimport/assetimport.pro
@@ -6,19 +6,25 @@ MODULE_PLUGIN_TYPES = assetimporters
QT += core-private gui qml quick3drender-private quick3dutils-private
SOURCES = \
+ qssgmeshutilities.cpp
+
+HEADERS = \
+ qssgmeshutilities_p.h
+
+!integrity:!android|android_app:!wasm:!cross_compile {
+SOURCES += \
qssgassetimporterfactory.cpp \
qssgassetimportmanager.cpp \
- qssgmeshutilities.cpp \
qssgqmlutilities.cpp
-HEADERS = \
+HEADERS += \
qtquick3dassetimportglobal_p.h \
qssgqmlutilities_p.h \
qssgassetimporter_p.h \
qssgassetimporterfactory_p.h \
qssgassetimporterplugin_p.h \
qssgassetimportmanager_p.h \
- qssgmeshutilities_p.h
+}
DEFINES += QT_BUILD_QUICK3DASSETIMPORT_LIB
diff --git a/src/plugins/assetimporters/assetimporters.pro b/src/plugins/assetimporters/assetimporters.pro
index f214c8a94..5c57f8ee5 100644
--- a/src/plugins/assetimporters/assetimporters.pro
+++ b/src/plugins/assetimporters/assetimporters.pro
@@ -1,11 +1,8 @@
TEMPLATE = subdirs
-# Only build import plugins on platforms that would run tooling
-!integrity:!android|android_app:!wasm:!cross_compile {
- SUBDIRS = \
- uip
+SUBDIRS = \
+ uip
- qtConfig(assimp):{
- SUBDIRS += assimp
- }
+qtConfig(assimp):{
+ SUBDIRS += assimp
}
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index c363d76a4..5f9e0d806 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -1,4 +1,7 @@
TEMPLATE = subdirs
-SUBDIRS = assetimporters
+# Only build import plugins on platforms that would run tooling
+!integrity:!android|android_app:!wasm:!cross_compile {
+ SUBDIRS = assetimporters
+}
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 5a7db8fba..98395df37 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -1,7 +1,10 @@
TEMPLATE = subdirs
SUBDIRS = \
cmake \
- assetimport \
quick3d \
quick3d_lancelot \
utils
+
+!integrity:!android|android_app:!wasm:!cross_compile {
+ SUBDIRS += assetimport
+}
--
GitLab