diff options
Diffstat (limited to 'src/controls/controls.pro')
-rw-r--r-- | src/controls/controls.pro | 44 |
1 files changed, 16 insertions, 28 deletions
diff --git a/src/controls/controls.pro b/src/controls/controls.pro index 63d055d6..07e8e002 100644 --- a/src/controls/controls.pro +++ b/src/controls/controls.pro @@ -40,8 +40,12 @@ CONTROLS_QML_FILES = \ ToolBar.qml \ ToolButton.qml -!qtquickcompiler: QML_FILES += $$CONTROLS_QML_FILES -qtquickcompiler: DEFINES += ALWAYS_LOAD_FROM_RESOURCES +qtquickcompiler { + DEFINES += ALWAYS_LOAD_FROM_RESOURCES +} else { + QML_FILES += $$CONTROLS_QML_FILES + !static: CONFIG += qmlcache +} SOURCES += $$PWD/plugin.cpp HEADERS += $$PWD/plugin.h @@ -55,41 +59,25 @@ include(Shaders/shaders.pri) osx: LIBS_PRIVATE += -framework Carbon -!static { - # Create the resource file - GENERATED_RESOURCE_FILE = $$OUT_PWD/controls.qrc - +!qmlcache { INCLUDED_RESOURCE_FILES = \ $$CONTROLS_QML_FILES \ $$PRIVATE_QML_FILES \ - $$STYLES_QML_FILES \ - $$SHADER_FILES - - RESOURCE_CONTENT = \ - "<RCC>" \ - "<qresource prefix=\"/QtQuick/Controls\">" - - for(resourcefile, INCLUDED_RESOURCE_FILES) { - resourcefileabsolutepath = $$absolute_path($$resourcefile) - relativepath_in = $$relative_path($$resourcefileabsolutepath, $$_PRO_FILE_PWD_) - relativepath_out = $$relative_path($$resourcefileabsolutepath, $$OUT_PWD) - RESOURCE_CONTENT += "<file alias=\"$$relativepath_in\">$$relativepath_out</file>" - } + $$STYLES_QML_FILES - RESOURCE_CONTENT += \ - "</qresource>" \ - "</RCC>" - - write_file($$GENERATED_RESOURCE_FILE, RESOURCE_CONTENT)|error("Aborting.") - - RESOURCES += $$GENERATED_RESOURCE_FILE } else { QML_FILES *= $$CONTROLS_QML_FILES \ $$PRIVATE_QML_FILES \ - $$STYLES_QML_FILES \ + $$STYLES_QML_FILES + OTHER_FILES += $$QML_FILES \ $$SHADER_FILES - OTHER_FILES += $$QML_FILES } +INCLUDED_RESOURCE_FILES += $$SHADER_FILES + +controls.files = $$INCLUDED_RESOURCE_FILES +controls.prefix = /QtQuick/Controls +RESOURCES += controls + CONFIG += no_cxx_module load(qml_plugin) |