diff options
| author | Topi Reinio <topi.reinio@digia.com> | 2014-02-20 13:49:55 +0100 |
|---|---|---|
| committer | Kalle Viironen <kalle.viironen@digia.com> | 2014-02-20 17:44:07 +0200 |
| commit | 0325d7b4156098ef064f04208905712c5bf0174e (patch) | |
| tree | bad33c0a01cc4274dee43c8370a0bdcd08d6fc7f /basicsuite | |
| parent | f261c03c73970a14f361bb9d00864f3357403c1d (diff) | |
Fix deployment of QML import plugins when building in Qt Creator
Task-number: QTEE-419
Task-number: QTEE-420
Change-Id: Iaa57cf0b4060f1dfb3fad3e81bc4c4d070cc6820
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@digia.com>
Reviewed-by: Kalle Viironen <kalle.viironen@digia.com>
Diffstat (limited to 'basicsuite')
| -rw-r--r-- | basicsuite/camera/camerautils/camerautils.pro | 5 | ||||
| -rw-r--r-- | basicsuite/qt5-everywhere/demos/shaders/import/import.pro | 17 | ||||
| -rw-r--r-- | basicsuite/sensorexplorer/imports/imports.pro | 15 |
3 files changed, 26 insertions, 11 deletions
diff --git a/basicsuite/camera/camerautils/camerautils.pro b/basicsuite/camera/camerautils/camerautils.pro index 938a0a9..7e5864e 100644 --- a/basicsuite/camera/camerautils/camerautils.pro +++ b/basicsuite/camera/camerautils/camerautils.pro @@ -12,8 +12,9 @@ HEADERS += camerautils.h pluginfiles.files += \ qmldir \ -target.path += $$[QT_INSTALL_QML]/CameraUtils -pluginfiles.path += $$[QT_INSTALL_QML]/CameraUtils +B2QT_DEPLOYPATH = /data/user/qt/qmlplugins/CameraUtils +target.path += $$B2QT_DEPLOYPATH +pluginfiles.path += $$B2QT_DEPLOYPATH INSTALLS += target pluginfiles diff --git a/basicsuite/qt5-everywhere/demos/shaders/import/import.pro b/basicsuite/qt5-everywhere/demos/shaders/import/import.pro index d72fb60..af51461 100644 --- a/basicsuite/qt5-everywhere/demos/shaders/import/import.pro +++ b/basicsuite/qt5-everywhere/demos/shaders/import/import.pro @@ -1,13 +1,20 @@ -CXX_MODULE = qml +TEMPLATE = lib +CONFIG += plugin + TARGET = shaderreader -TARGETPATH = ShaderReader -IMPORT_VERSION = 1.0 -QT += quick +QT += qml quick SOURCES = main.cpp \ shaderfilereader.cpp \ HEADERS = shaderfilereader.h \ -load(qml_plugin) +pluginfiles.files += \ + qmldir \ + +B2QT_DEPLOYPATH = /data/user/qt/qmlplugins/ShaderReader +target.path += $$B2QT_DEPLOYPATH +pluginfiles.path += $$B2QT_DEPLOYPATH + +INSTALLS += target pluginfiles diff --git a/basicsuite/sensorexplorer/imports/imports.pro b/basicsuite/sensorexplorer/imports/imports.pro index c596185..41a5f18 100644 --- a/basicsuite/sensorexplorer/imports/imports.pro +++ b/basicsuite/sensorexplorer/imports/imports.pro @@ -1,7 +1,7 @@ -CXX_MODULE = qml +TEMPLATE = lib +CONFIG += plugin + TARGET = sensorexplorer -TARGETPATH = Explorer -IMPORT_VERSION = 1.0 QT += qml sensors @@ -14,4 +14,11 @@ HEADERS = explorer.h \ sensoritem.h \ propertyinfo.h \ -load(qml_plugin) +pluginfiles.files += \ + qmldir \ + +B2QT_DEPLOYPATH = /data/user/qt/qmlplugins/Explorer +target.path += $$B2QT_DEPLOYPATH +pluginfiles.path += $$B2QT_DEPLOYPATH + +INSTALLS += target pluginfiles |