[Buildroot] [PATCH 1/1] qt5: qt5websockets: install missing qml modules

[Buildroot] [PATCH 1/1] qt5: qt5websockets: install missing qml modules

[Manfred Schlaegl]

QML modules for QtWebSockets are located in /usr/qml/QtWebSockets since
Qt 5.5.

/usr/qml/Qt/WebSockets still exists for compatibility reasons, but
it contains only a qmldir file which points to ../../QtWebSockets/.

see also: http://doc.qt.io/qt-5.6/qtwebsockets-qmlmodule.html

Signed-off-by: Manfred Schlaegl <manfred.schlaegl@ginzinger.com>
---
 package/qt5/qt5websockets/qt5websockets.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/qt5/qt5websockets/qt5websockets.mk b/package/qt5/qt5websockets/qt5websockets.mk
index 4d9df9257b..c67db198db 100644
--- a/package/qt5/qt5websockets/qt5websockets.mk
+++ b/package/qt5/qt5websockets/qt5websockets.mk
@@ -41,6 +41,7 @@ endef
 ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y)
 define QT5WEBSOCKETS_INSTALL_TARGET_QMLS
 	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/WebSockets $(TARGET_DIR)/usr/qml/Qt/
+	cp -dpfr $(STAGING_DIR)/usr/qml/QtWebSockets $(TARGET_DIR)/usr/qml/
 endef
 endif
 
-- 
2.11.0

[Buildroot] [PATCH 1/1] qt5: qt5websockets: install missing qml modules

[Thomas Petazzoni]

Hello,

Thanks for your contribution!

On Wed, 11 Apr 2018 14:40:37 +0200, Manfred Schlaegl wrote:
> QML modules for QtWebSockets are located in /usr/qml/QtWebSockets since
> Qt 5.5.
> 
> /usr/qml/Qt/WebSockets still exists for compatibility reasons, but
> it contains only a qmldir file which points to ../../QtWebSockets/.

Does this mean we should remove the installation
of /usr/qml/Qt/WebSockets ?

I've applied your patch to master as-is, anyway. Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH 1/1] qt5: qt5websockets: install missing qml modules

[Manfred Schlaegl]

Hi,

On 2018-04-16 17:48, Thomas Petazzoni wrote:
> Hello,
> 
> Thanks for your contribution!
Thanks for maintaining ;-)

> 
> On Wed, 11 Apr 2018 14:40:37 +0200, Manfred Schlaegl wrote:
>> QML modules for QtWebSockets are located in /usr/qml/QtWebSockets since
>> Qt 5.5.
>>
>> /usr/qml/Qt/WebSockets still exists for compatibility reasons, but
>> it contains only a qmldir file which points to ../../QtWebSockets/.
> 
> Does this mean we should remove the installation
> of /usr/qml/Qt/WebSockets ?

Newer projects (since Qt5.5) use
{{{
import QtWebSockets 1.0
}}}
which translates to /usr/qml/QtWebSockets
-> This is, what was missing.

Older projects (prior Qt5.5) use
{{{
import Qt.WebSockets 1.0
}}}
which resolves to /usr/qml/Qt/WebSockets
-> We don't want to break them, so we have to keep /usr/qml/Qt/WebSockets.

In short: We have to keep it. ;-)

> 
> I've applied your patch to master as-is, anyway. Thanks!
> 
> Thomas
> 
Thanks!

Best regards,
Manfred

[Buildroot] [PATCH 1/1] qt5: qt5websockets: install missing qml modules

[Thomas Petazzoni]

Hello,

On Mon, 16 Apr 2018 18:06:39 +0200, Manfred Schlaegl wrote:

> -> We don't want to break them, so we have to keep /usr/qml/Qt/WebSockets.  
> 
> In short: We have to keep it. ;-)

ACK, thanks for the confirmation!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH 1/1] qt5: qt5websockets: install missing qml modules

[Peter Korsgaard]

>>>>> "Manfred" == Manfred Schlaegl <manfred.schlaegl@ginzinger.com> writes:

 > QML modules for QtWebSockets are located in /usr/qml/QtWebSockets since
 > Qt 5.5.

 > /usr/qml/Qt/WebSockets still exists for compatibility reasons, but
 > it contains only a qmldir file which points to ../../QtWebSockets/.

 > see also: http://doc.qt.io/qt-5.6/qtwebsockets-qmlmodule.html

 > Signed-off-by: Manfred Schlaegl <manfred.schlaegl@ginzinger.com>

Committed to 2018.02.x, thanks.

-- 
Bye, Peter Korsgaard