diff options
author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-20 15:53:39 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-20 15:53:39 +0100 |
commit | bfbcec26eb6f9423ee27d75ae5abcd70cd255390 (patch) | |
tree | 5845eda8e07adef5dbf27d56107e5330ea5d3fbf /examples/declarative/cppextensions | |
parent | 4b4c6a984b2bcdfcb5a77a024e48072a7aa854ec (diff) | |
parent | 41119e843f099ce7d80f966cc754324bfe0f063f (diff) |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
.qmake.conf
Change-Id: I85eac7ffdbd673aeba4e7437fa5a9dc50759a736
Diffstat (limited to 'examples/declarative/cppextensions')
-rw-r--r-- | examples/declarative/cppextensions/qgraphicslayouts/layoutitem/main.cpp | 2 |
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); |