diff options
4 files changed, 8 insertions, 8 deletions
diff --git a/doc/systemui.qdoc b/doc/systemui.qdoc index 170cdbbb..44a2a3a6 100644 --- a/doc/systemui.qdoc +++ b/doc/systemui.qdoc @@ -104,7 +104,7 @@ One example of a simple System UI is the one written for the "Hello World!" Syst \quotefromfile ../examples/applicationmanager/hello-world/system-ui.qml \skipto Item { -\printuntil window: model.window } } } } +\printuntil /^\}/ \section2 Notifications diff --git a/examples/applicationmanager/application-features/doc/src/application-features.qdoc b/examples/applicationmanager/application-features/doc/src/application-features.qdoc index 17abff0c..78eb57b2 100644 --- a/examples/applicationmanager/application-features/doc/src/application-features.qdoc +++ b/examples/applicationmanager/application-features/doc/src/application-features.qdoc @@ -91,7 +91,7 @@ The QML code for the crash simulation and recovery application is as follows: \quotefromfile applicationmanager/application-features/apps/crash/crashapp.qml \skipto import QtQuick 2.11 \printuntil case "gracefully": Terminator.exitGracefully(); break; -\printuntil } } } } } } } +\printuntil /^\}/ \section2 Two Top-Level Windows @@ -103,7 +103,7 @@ The QML code for the two top-level windows application is as follows: \quotefromfile applicationmanager/application-features/apps/twins/twins.qml \skipto import QtQuick 2.11 \printuntil Component.onCompleted: setWindowProperty("type", "pop-up"); -\printuntil } } } +\printuntil /^\}/ \section2 Native Widgets @@ -120,7 +120,7 @@ The C++ code for the native widgets application is as follows: \quotefromfile applicationmanager/application-features/native/widgets/main.cpp \skipto #include <QApplication> -\printuntil return app.exec(); } +\printuntil /^\}/ \section1 Code Structure diff --git a/examples/applicationmanager/custom-appman/doc/src/custom-appman.qdoc b/examples/applicationmanager/custom-appman/doc/src/custom-appman.qdoc index 7aed03bb..4edcc3fb 100644 --- a/examples/applicationmanager/custom-appman/doc/src/custom-appman.qdoc +++ b/examples/applicationmanager/custom-appman/doc/src/custom-appman.qdoc @@ -69,7 +69,7 @@ Generally, it's a good idea to set an application name and version. We want the application manager's logging part to be initialized as early as possible, especially when we are dealing with DLT logging. -\printline Package::ensure +\printline PackageUtilities::ensure If you are using the application manager's installer part, this function needs to be called \e before the QApplication constructor to make sure that your C locale is a UTF-8 variant. This is diff --git a/src/intent-server-lib/intentserver.cpp b/src/intent-server-lib/intentserver.cpp index e7663dc4..1ae98091 100644 --- a/src/intent-server-lib/intentserver.cpp +++ b/src/intent-server-lib/intentserver.cpp @@ -434,11 +434,11 @@ Intent *IntentServer::intent(int index) const and \a parameters or \c null if the id does not exist. This method exposes the same functionality that is used internally to match incoming Intent - requests for the intent identified by \a intentId and targeted for the package identified by - \a packageId. + requests for the intent identified by \a intentId and targeted for the application identified by + \a applicationId. Although you could iterate over the intentList yourself in JavaScript, this function has the added benefit of also checking the optionally provided \a parameters against any given - \l{Intent::parameterMatch}{parameter matches}. + \l{IntentObject::parameterMatch}{parameter matches}. \note The object ownership of the returned Intent object stays with the application-manager. If you want to store this pointer, you can use the IntentServer's QAbstractListModel |