diff --git a/doc/qtcreator/examples/textfinder/input.txt b/doc/qtcreator/examples/textfinder/input.txt index 044545418a7..016bb2a072b 100644 --- a/doc/qtcreator/examples/textfinder/input.txt +++ b/doc/qtcreator/examples/textfinder/input.txt @@ -1,2 +1,10 @@ -These forms are processed at run-time to produce dynamically-generated user interfaces. In order to generate a form at run-time, a resource file containing a .ui file is needed. Applications that use the form handling classes need to be configured to be built against the QtUiTools module. This is done by including the following declaration in a qmake project file to ensure that the application is compiled and linked appropriately. A form loader object, provided by the QUiLoader class, is used to construct the user interface. This user interface -can be retrieved from any QIODevice; for example, a QFile object can be used to obtain a form stored in a project's resources. The QUiLoader::load() function takes the user interface description contained in the file and constructs the form widget. \ No newline at end of file +IDE Overview + +Qt Creator is an integrated development environment (IDE) that provides you +with tools to design and develop applications with the Qt application framework. +Qt is designed for developing applications and user interfaces once and +deploying them to several desktop, embedded, and mobile operating systems or web +browsers (experimental). Qt Creator provides you with tools for accomplishing +your tasks throughout the whole application development life-cycle, from +creating a project to deploying the application to the target platforms. + diff --git a/doc/qtcreator/images/qtcreator-class-info-qt-gui.png b/doc/qtcreator/images/qtcreator-class-info-qt-gui.png index adb7adf6084..9ca3f6aba4d 100644 Binary files a/doc/qtcreator/images/qtcreator-class-info-qt-gui.png and b/doc/qtcreator/images/qtcreator-class-info-qt-gui.png differ diff --git a/doc/qtcreator/images/qtcreator-intro-and-location-qt-gui.png b/doc/qtcreator/images/qtcreator-intro-and-location-qt-gui.png index 84ece94bc33..2afd5e6c149 100644 Binary files a/doc/qtcreator/images/qtcreator-intro-and-location-qt-gui.png and b/doc/qtcreator/images/qtcreator-intro-and-location-qt-gui.png differ diff --git a/doc/qtcreator/images/qtcreator-new-project-build-system-qt-gui.png b/doc/qtcreator/images/qtcreator-new-project-build-system-qt-gui.png new file mode 100644 index 00000000000..9bcb248e0f8 Binary files /dev/null and b/doc/qtcreator/images/qtcreator-new-project-build-system-qt-gui.png differ diff --git a/doc/qtcreator/images/qtcreator-new-project-qt-versions-qt-gui.png b/doc/qtcreator/images/qtcreator-new-project-qt-versions-qt-gui.png index c8c83655394..b829cee9512 100644 Binary files a/doc/qtcreator/images/qtcreator-new-project-qt-versions-qt-gui.png and b/doc/qtcreator/images/qtcreator-new-project-qt-versions-qt-gui.png differ diff --git a/doc/qtcreator/images/qtcreator-new-project-summary-qt-gui.png b/doc/qtcreator/images/qtcreator-new-project-summary-qt-gui.png index 70daffe6afa..e7b04b20542 100644 Binary files a/doc/qtcreator/images/qtcreator-new-project-summary-qt-gui.png and b/doc/qtcreator/images/qtcreator-new-project-summary-qt-gui.png differ diff --git a/doc/qtcreator/images/qtcreator-new-qt-gui-application.png b/doc/qtcreator/images/qtcreator-new-qt-gui-application.png index fff63015df4..6ee1705462f 100644 Binary files a/doc/qtcreator/images/qtcreator-new-qt-gui-application.png and b/doc/qtcreator/images/qtcreator-new-qt-gui-application.png differ diff --git a/doc/qtcreator/images/qtcreator-texfinder-filter.png b/doc/qtcreator/images/qtcreator-texfinder-filter.png deleted file mode 100644 index f4a5e26ea3c..00000000000 Binary files a/doc/qtcreator/images/qtcreator-texfinder-filter.png and /dev/null differ diff --git a/doc/qtcreator/images/qtcreator-texfinder-ui-horizontal-layout.png b/doc/qtcreator/images/qtcreator-texfinder-ui-horizontal-layout.png deleted file mode 100644 index 3b82d7a44aa..00000000000 Binary files a/doc/qtcreator/images/qtcreator-texfinder-ui-horizontal-layout.png and /dev/null differ diff --git a/doc/qtcreator/images/qtcreator-textfinder-contents.png b/doc/qtcreator/images/qtcreator-textfinder-contents.png index fd5b004ed72..213edc62b1e 100644 Binary files a/doc/qtcreator/images/qtcreator-textfinder-contents.png and b/doc/qtcreator/images/qtcreator-textfinder-contents.png differ diff --git a/doc/qtcreator/images/qtcreator-textfinder-filter.png b/doc/qtcreator/images/qtcreator-textfinder-filter.png new file mode 100644 index 00000000000..2a111212adf Binary files /dev/null and b/doc/qtcreator/images/qtcreator-textfinder-filter.png differ diff --git a/doc/qtcreator/images/qtcreator-textfinder-objectname.png b/doc/qtcreator/images/qtcreator-textfinder-objectname.png index 35244cfcaa7..c846e612b9a 100644 Binary files a/doc/qtcreator/images/qtcreator-textfinder-objectname.png and b/doc/qtcreator/images/qtcreator-textfinder-objectname.png differ diff --git a/doc/qtcreator/images/qtcreator-textfinder-screenshot.png b/doc/qtcreator/images/qtcreator-textfinder-screenshot.png index 9816219e851..94875d045e7 100644 Binary files a/doc/qtcreator/images/qtcreator-textfinder-screenshot.png and b/doc/qtcreator/images/qtcreator-textfinder-screenshot.png differ diff --git a/doc/qtcreator/images/qtcreator-textfinder-ui-horizontal-layout.png b/doc/qtcreator/images/qtcreator-textfinder-ui-horizontal-layout.png new file mode 100644 index 00000000000..da21b0452ec Binary files /dev/null and b/doc/qtcreator/images/qtcreator-textfinder-ui-horizontal-layout.png differ diff --git a/doc/qtcreator/images/qtcreator-textfinder-ui-widgets.png b/doc/qtcreator/images/qtcreator-textfinder-ui-widgets.png index 2bd0951e239..f061dc00510 100644 Binary files a/doc/qtcreator/images/qtcreator-textfinder-ui-widgets.png and b/doc/qtcreator/images/qtcreator-textfinder-ui-widgets.png differ diff --git a/doc/qtcreator/images/qtcreator-textfinder-ui.png b/doc/qtcreator/images/qtcreator-textfinder-ui.png index 8405689b1ee..c0159456d55 100644 Binary files a/doc/qtcreator/images/qtcreator-textfinder-ui.png and b/doc/qtcreator/images/qtcreator-textfinder-ui.png differ diff --git a/doc/qtcreator/src/widgets/qtdesigner-app-tutorial.qdoc b/doc/qtcreator/src/widgets/qtdesigner-app-tutorial.qdoc index 71c225f31b3..ae76170d450 100644 --- a/doc/qtcreator/src/widgets/qtdesigner-app-tutorial.qdoc +++ b/doc/qtcreator/src/widgets/qtdesigner-app-tutorial.qdoc @@ -49,7 +49,7 @@ \list 1 \li Select \uicontrol File > \uicontrol {New File or Project} > - \uicontrol Application > \uicontrol {Qt Widgets Application} > + \uicontrol Application (Qt) > \uicontrol {Qt Widgets Application} > \uicontrol Choose. \image qtcreator-new-qt-gui-application.png "New File or Project dialog" @@ -61,20 +61,16 @@ \li In the \uicontrol{Name} field, type \b {TextFinder}. \li In the \uicontrol {Create in} field, enter the path for the project files. - For example, \c {C:\Qt\examples}, and then click \uicontrol{Next} (on + For example, \c {C:\Qt\examples}, and then select \uicontrol{Next} (on Windows and Linux) or \uicontrol Continue (on \macos). - The \uicontrol {Kit Selection} dialog opens. + The \uicontrol {Define Build System} dialog opens. - \image qtcreator-new-project-qt-versions-qt-gui.png "Kit Selection dialog" + \image qtcreator-new-project-build-system-qt-gui.png "Define Build System dialog" - \li Select build and run \l{glossary-buildandrun-kit}{kits} for your project, - and click \uicontrol Next or \uicontrol Continue. - - \note If only one kit is specified in \uicontrol Tools > - \uicontrol Options > \uicontrol Kits (on Windows and Linux) or in - \uicontrol {\QC} > \uicontrol Preferences > \uicontrol Kits - (on \macos), this dialog is skipped. + \li In the \uicontrol {Build system} field, select the build system to + use for building and running the project: \l qmake, + \l {Setting Up CMake}{CMake}, or \l {Setting Up Qbs}{Qbs}. The \uicontrol{Class Information} dialog opens. @@ -89,13 +85,20 @@ \note The \uicontrol{Header file}, \uicontrol{Source file} and \uicontrol{Form file} fields are automatically updated to match the name of the class. - \li Click \uicontrol Next or \uicontrol Continue. + The \uicontrol {Kit Selection} dialog opens. + + \image qtcreator-new-project-qt-versions-qt-gui.png "Kit Selection dialog" + + \li Select build and run \l{glossary-buildandrun-kit}{kits} for your project, + and select \uicontrol Next or \uicontrol Continue. + + \li Select \uicontrol Next or \uicontrol Continue. The \uicontrol{Project Management} dialog opens. \image qtcreator-new-project-summary-qt-gui.png "Project Management dialog" - \li Review the project settings, and click \uicontrol{Finish} (on Windows and + \li Review the project settings, and select \uicontrol{Finish} (on Windows and Linux) or \uicontrol Done (on \macos) to create the project. \endlist @@ -107,9 +110,9 @@ \list + \li main.cpp \li textfinder.h \li textfinder.cpp - \li main.cpp \li textfinder.ui \li textfinder.pro @@ -150,7 +153,7 @@ \uicontrol Sidebar. For example, to find the \uicontrol Label widget, start typing the word \b label. - \image qtcreator-texfinder-filter.png "Filter field" + \image qtcreator-textfinder-filter.png "Filter field" \li Double-click the \uicontrol{Label} widget and enter the text \b{Keyword}. @@ -164,23 +167,23 @@ \image qtcreator-textfinder-objectname.png "Changing object names" \li Press \key {Ctrl+A} (or \key {Cmd+A}) to select the widgets and - click \uicontrol{Lay out Horizontally} (or press \uicontrol{Ctrl+H} on Linux or + select \uicontrol{Lay out Horizontally} (or press \key {Ctrl+H} on Linux or Windows or \key {Ctrl+Shift+H} on \macos) to apply a horizontal layout (QHBoxLayout). - \image qtcreator-texfinder-ui-horizontal-layout.png "Applying horizontal layout" + \image qtcreator-textfinder-ui-horizontal-layout.png "Applying horizontal layout" \li Drag and drop a \uicontrol{Text Edit} widget (QTextEdit) to the form. - \li Select the screen area and click \uicontrol{Lay out Vertically} (or press - \uicontrol{Ctrl+L}) to apply a vertical layout (QVBoxLayout). + \li Select the screen area, and then select \uicontrol{Lay out Vertically} + (or press \key {Ctrl+L}) to apply a vertical layout (QVBoxLayout). \image qtcreator-textfinder-ui.png "Text Finder UI" Applying the horizontal and vertical layouts ensures that the application UI scales to different screen sizes. - \li To call a find function when users press the \uicontrol Find button, you + \li To call a find function when users select the \uicontrol Find button, you use the Qt signals and slots mechanism. A signal is emitted when a particular event occurs and a slot is a function that is called in response to a particular signal. Qt widgets have predefined signals @@ -201,7 +204,7 @@ \endlist - \li Press \uicontrol{Ctrl+S} (or \key {Cmd+S}) to save your changes. + \li Press \key {Ctrl+S} (or \key {Cmd+S}) to save your changes. \endlist @@ -295,7 +298,7 @@ \li In the \uicontrol{Name} field, enter \b{textfinder}. \li In the \uicontrol{Path} field, enter \c{C:\Qt\examples\TextFinder}, - and click \uicontrol Next or \uicontrol Continue. + and select \uicontrol Next or \uicontrol Continue. The \uicontrol{Project Management} dialog opens. @@ -303,8 +306,8 @@ \li In the \uicontrol{Add to project} field, select \b{TextFinder.pro} - and click \uicontrol{Finish} or \uicontrol Done to open the file in the code - editor. + and select \uicontrol{Finish} or \uicontrol Done to open the file + in the code editor. \li Select \uicontrol Add > \uicontrol {Add Prefix}. @@ -320,7 +323,7 @@ \section1 Compiling and Running Your Program - Now that you have all the necessary files, click the + Now that you have all the necessary files, select the \inlineimage run_small.png button to compile and run your program.