diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-02-05 10:19:52 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-02-05 11:59:35 +0100 |
| commit | 5c121d57911d91f19b066803ad38ca4815255dde (patch) | |
| tree | 728e9206d48968ccbc72dafcd284da4c47b2a9e7 /doc/qtcreator/examples | |
| parent | aeb7ef6b37030ed4beb8f431167d2ef88172486b (diff) | |
| parent | b2ddeacfb5c54d3b0e15c8e6087d21aefaed4d7a (diff) | |
| download | qt-creator-5c121d57911d91f19b066803ad38ca4815255dde.tar.gz | |
Merge remote-tracking branch 'origin/4.11'
Conflicts:
src/plugins/genericprojectmanager/genericproject.cpp
Change-Id: Ib54f1645ec70a9e6460a888a13190ede130bccca
Diffstat (limited to 'doc/qtcreator/examples')
| -rw-r--r-- | doc/qtcreator/examples/progressbar/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/qtcreator/examples/progressbar/main.cpp b/doc/qtcreator/examples/progressbar/main.cpp index d8275e35c2..b418a6c3df 100644 --- a/doc/qtcreator/examples/progressbar/main.cpp +++ b/doc/qtcreator/examples/progressbar/main.cpp @@ -9,7 +9,7 @@ int main(int argc, char *argv[]) QGuiApplication app(argc, argv); QQuickView view; - view.engine->addImportPath("qrc:/qml/imports"); + view.engine()->addImportPath("qrc:/qml/imports"); view.setSource(QUrl("qrc:/qml/ProgressBar.ui.qml")); if (!view.errors().isEmpty()) return -1; |