diff options
| author | Andy Nichols <andy.nichols@theqtcompany.com> | 2015-10-26 19:24:56 +0100 |
|---|---|---|
| committer | Andy Nichols <andy.nichols@theqtcompany.com> | 2015-10-26 19:00:45 +0000 |
| commit | 5017dd3572badfa9cd80eca3be220fd6f5635520 (patch) | |
| tree | 3bf5edc0f4ffbb82a54db1ae19e556b80088aaf1 /tools | |
| parent | 12e1e34273a3311ef5d3c5af819f245db077f618 (diff) | |
qgltf: Remove qmake feature file
It isn't yet possible to install qmake features from modules, so it
has been moved into qtbase. This make it actually possible to use the
qgltf feature on any platform now (not just places where you ran 'make
install').
Change-Id: I562ff98f71562c8f023437905be3e8725953fc7e
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qgltf/qgltf.prf | 33 | ||||
| -rw-r--r-- | tools/qgltf/qgltf.pro | 4 |
2 files changed, 0 insertions, 37 deletions
diff --git a/tools/qgltf/qgltf.prf b/tools/qgltf/qgltf.prf deleted file mode 100644 index 06f2bc3e2..000000000 --- a/tools/qgltf/qgltf.prf +++ /dev/null @@ -1,33 +0,0 @@ -qtPrepareTool(QMAKE_QGLTF, qgltf) - -load(resources) - -isEmpty(MODELS): error("qgltf must be loaded after specifying MODELS") - -QGLTF_DIR = qmodels - -qgltf.commands = $$QMAKE_QGLTF -d $$QGLTF_DIR $$QGLTF_PARAMS ${QMAKE_FILE_NAME} -qgltf.input = MODELS -qgltf.output = $$QGLTF_DIR/${QMAKE_FILE_BASE}.gltf -qgltf.CONFIG += no_link target_predeps -silent { - qgltf.commands += -s - qgltf.commands = @echo qgltf ${QMAKE_FILE_IN} && $$qgltf.commands -} -QMAKE_EXTRA_COMPILERS += qgltf - -asset_builder.commands = $$QMAKE_RCC -binary $$QGLTF_DIR/${QMAKE_FILE_BASE}.qrc -o ${QMAKE_FILE_OUT} -compress 9 -threshold 0 -asset_builder.input = MODELS -asset_builder.output = ${QMAKE_FILE_BASE}.qrb -asset_builder.CONFIG += no_link target_predeps -asset_builder.depends = $$QGLTF_DIR/${QMAKE_FILE_BASE}.gltf -QMAKE_EXTRA_COMPILERS += asset_builder - -for (model, MODELS) { - base_model = $$basename(model) - qrb_model = $$replace(base_model, (.+)\\..+$, \\1.qrb) - asset_install.files += $$absolute_path($$qrb_model, $$OUT_PWD) -} -asset_install.path = $$target.path -asset_install.CONFIG += no_check_exist -INSTALLS += asset_install diff --git a/tools/qgltf/qgltf.pro b/tools/qgltf/qgltf.pro index 9181ddfbd..54bf22a34 100644 --- a/tools/qgltf/qgltf.pro +++ b/tools/qgltf/qgltf.pro @@ -4,7 +4,3 @@ load(qt_tool) SOURCES = $$PWD/qgltf.cpp include(../../src/3rdparty/assimp/assimp.pri) - -mkspecs_features.files = $$PWD/qgltf.prf -mkspecs_features.path = $$[QT_HOST_DATA]/mkspecs/features -INSTALLS += mkspecs_features |