Merge remote-tracking branch 'origin/5.4' into 5.5

Conflicts:
	.qmake.conf

Change-Id: I85eac7ffdbd673aeba4e7437fa5a9dc50759a736

1 files changed, 1 insertions, 1 deletions

diff --git a/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/main.cpp b/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/main.cpp
index 58e36ada..73738375 100644
--- a/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/main.cpp
+++ b/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/main.cpp
@@ -64,7 +64,7 @@ int main(int argc, char* argv[])
 
     //Add the QML snippet into the layout
     QDeclarativeEngine engine;
-    QDeclarativeComponent c(&engine, QUrl(":layoutitem.qml"));
+    QDeclarativeComponent c(&engine, QUrl("qrc:layoutitem.qml"));
     QGraphicsLayoutItem* obj = qobject_cast<QGraphicsLayoutItem*>(c.create());
     layout->addItem(obj);