diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2017-04-19 09:56:14 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-04-19 09:56:14 +0200 |
| commit | 88897f3a870de7b756356907801f09a90902e490 (patch) | |
| tree | a947c7fdb92d9050e9ade763dcb87db192b4585e /doc | |
| parent | 8b6eb5aabb48fb83c3cd92be9a77401ca26a810b (diff) | |
| parent | 01b2ed7904132f845819e78c84477ac9a66bd1e3 (diff) | |
Merge remote-tracking branch 'origin/4.3'
Conflicts:
src/plugins/genericprojectmanager/genericproject.cpp
src/plugins/genericprojectmanager/genericproject.h
src/plugins/genericprojectmanager/genericprojectnodes.cpp
src/plugins/genericprojectmanager/genericprojectnodes.h
Change-Id: Ie0c870f68c8d200a75489b75860987655b2f6175
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/api/qtcreator-dev-wizards.qdoc | 4 | ||||
| -rw-r--r-- | doc/src/projects/creator-projects-build-run-tutorial.qdoc | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/doc/api/qtcreator-dev-wizards.qdoc b/doc/api/qtcreator-dev-wizards.qdoc index 096d3a8320..ddb11119ea 100644 --- a/doc/api/qtcreator-dev-wizards.qdoc +++ b/doc/api/qtcreator-dev-wizards.qdoc @@ -34,8 +34,8 @@ is not sufficient for your case, you can write wizards in code. A wizard in \QC is an instance of a class implementing - the Core::IWizardFactory interface that is registered with - ExtensionSystem::PluginManager. + the Core::IWizardFactory interface that has a creator function registered + with IWizardFactory::registerFactoryCreator. Implementing wizards requires: \list diff --git a/doc/src/projects/creator-projects-build-run-tutorial.qdoc b/doc/src/projects/creator-projects-build-run-tutorial.qdoc index 226bc4e5b6..4cdc509070 100644 --- a/doc/src/projects/creator-projects-build-run-tutorial.qdoc +++ b/doc/src/projects/creator-projects-build-run-tutorial.qdoc @@ -58,10 +58,13 @@ \image qtcreator-gs-build-example-open.png "Selecting an example" + If no examples are listed, check that a \l{Adding Qt Versions} + {Qt version} is installed and configured. + \li Select an example in the list of examples. You can also search for examples. Enter the \uicontrol android or - \uicontrol iOS keyword in the search field (2) to list all the + \uicontrol ios keyword in the search field (2) to list all the examples tested for Android or iOS. To list examples that you can run on embedded devices, enter the \uicontrol Boot2Qt keyword in the search field (commercial only). @@ -83,8 +86,8 @@ \li To see the compilation progress, press \key{Alt+4} to open the \uicontrol {Compile Output} pane. - If build errors occur, check that a \l{Adding Qt Versions} - {Qt version} and \l{Adding Compilers}{compiler} are installed and + If build errors occur, check that a Qt version and + \l{Adding Compilers}{compiler} are installed and configured and that the necessary kits are configured. If you are building for an \l{Connecting Android Devices}{Android device} or \l{Connecting iOS Devices}{iOS device}, check that the development |