From 0325d7b4156098ef064f04208905712c5bf0174e Mon Sep 17 00:00:00 2001
From: Topi Reinio <topi.reinio@digia.com>
Date: Thu, 20 Feb 2014 13:49:55 +0100
Subject: 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>
---
 .../qt5-everywhere/demos/shaders/import/import.pro      | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'basicsuite/qt5-everywhere')

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
-- 
cgit v1.2.3