diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/api/coding-style.qdoc | 20 | ||||
| -rw-r--r-- | doc/src/editors/creator-coding-edit-mode.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/editors/creator-editors.qdoc | 39 | ||||
| -rw-r--r-- | doc/src/howto/creator-external-tools.qdoc | 5 | ||||
| -rw-r--r-- | doc/src/projects/creator-projects-cmake.qdoc | 5 | ||||
| -rw-r--r-- | doc/src/projects/creator-projects-custom-wizards-json.qdoc | 4 | ||||
| -rw-r--r-- | doc/src/projects/creator-projects-qbs.qdoc | 9 | ||||
| -rw-r--r-- | doc/src/qtquick/qtquick-creating.qdoc | 6 |
8 files changed, 78 insertions, 12 deletions
diff --git a/doc/api/coding-style.qdoc b/doc/api/coding-style.qdoc index c667788c94..dbf165e626 100644 --- a/doc/api/coding-style.qdoc +++ b/doc/api/coding-style.qdoc @@ -879,7 +879,7 @@ \code auto something = new MyCustomType; auto keyEvent = static_cast<QKeyEvent *>(event); - auto myList = QStringList() << QLatin1String(“FooThing”) << QLatin1String(“BarThing”); + auto myList = QStringList() << QLatin1String("FooThing") << QLatin1String("BarThing"); \endcode \li When assigning iterator types. @@ -892,14 +892,16 @@ \section2 Using QObject \list - \li Every QObject subclass must have a Q_OBJECT macro, even if it - does not have signals or slots, if it is intended to be used - with qobject_cast<>. See also \l{Casting}. - \li Normalize the arguments for signals and slots - (see \l{http://qt-project.org/doc/qt-4.8/qmetaobject.html#normalizedSignature}{QMetaObject::normalizedSignature} - inside connect statements - to safely make signal and slot lookup a few cycles faster. - You can use $QTDIR/util/normalize to normalize existing code. + \li Remember to add the Q_OBJECT macro to QObject subclasses that rely + on the meta object system. Meta object system related features are + the definition of signals and slots, the use of \c{qobject_cast<>}, + and others. See also \l{Casting}. + \li Prefer Qt5-style \c{connect()} calls over Qt4-style. + \li When using Qt4-style \c{connect()} calls, normalize the arguments + for signals and slots inside connect statements to safely make + signal and slot lookup a few cycles faster. You can use + $QTDIR/util/normalize to normalize existing code. For more + information, see \l{http://qt-project.org/doc/qt-4.8/qmetaobject.html#normalizedSignature}{QMetaObject::normalizedSignature}. \endlist \section2 File Headers diff --git a/doc/src/editors/creator-coding-edit-mode.qdoc b/doc/src/editors/creator-coding-edit-mode.qdoc index 16bbefe6c8..c99b5a1f2e 100644 --- a/doc/src/editors/creator-coding-edit-mode.qdoc +++ b/doc/src/editors/creator-coding-edit-mode.qdoc @@ -48,7 +48,7 @@ (\uicontrol {Go Forward}). To go to any open file, select it from the \uicontrol{Open files} drop-down menu (1). - Right-click the menu title and select \uicontrol {Copy Full Path to Clipboard} to + Right-click the menu title and select \uicontrol {Copy Full Path} to copy the path and name of the current file to the clipboard. To jump to any symbol used in the current file, select it from the diff --git a/doc/src/editors/creator-editors.qdoc b/doc/src/editors/creator-editors.qdoc index 10f96efb32..40d09d6cfb 100644 --- a/doc/src/editors/creator-editors.qdoc +++ b/doc/src/editors/creator-editors.qdoc @@ -2059,7 +2059,8 @@ containing such declarations \row \li Create Getter and Setter Member Functions - \li Creates getter and setter member functions for member variables. + \li Creates either both getter and setter member functions for member variables or + only a getter or setter. \li Member variable in class definition \row \li Move Function Definition @@ -2089,6 +2090,42 @@ \li Function signature \row + \li Move All Function Definitions + \li Moves all function definitions to the implementation file or outside the class. For example, rewrites: + + \code + class Foo + { + void bar() + { + // do stuff here + } + void baz() + { + // do stuff here + } + }; + \endcode + + as + \code + class Foo + { + void bar(); + void baz(); + }; + + void Foo::bar() { + // do stuff here + } + + void Foo::baz() { + // do stuff here + } + \endcode + + \li Class name + \row \li Assign to Local Variable \li Adds a local variable which stores the return value of a function call or a new expression. For example, rewrites: diff --git a/doc/src/howto/creator-external-tools.qdoc b/doc/src/howto/creator-external-tools.qdoc index ce58454b3c..e8a89ae3d8 100644 --- a/doc/src/howto/creator-external-tools.qdoc +++ b/doc/src/howto/creator-external-tools.qdoc @@ -115,6 +115,11 @@ \li In the \uicontrol {Working directory} field, specify the path to the working directory. + \li In the \uicontrol Environment field, select \uicontrol Change to modify + environment variable values for build and run environments in + the \uicontrol {Edit Environment Changes} dialog. For more information + about how to add and remove variable values, see \l{Batch Editing}. + \li In the \uicontrol {Output pane}, select how to handle output from the tool. You can ignore the output, view it in the \uicontrol {General Messages} output pane, or replace the selected text with the diff --git a/doc/src/projects/creator-projects-cmake.qdoc b/doc/src/projects/creator-projects-cmake.qdoc index f3a97b0290..0639621bd9 100644 --- a/doc/src/projects/creator-projects-cmake.qdoc +++ b/doc/src/projects/creator-projects-cmake.qdoc @@ -115,7 +115,10 @@ \QC cannot extract files to be installed from a CMake project, and therefore, only executable targets are automatically added to deployment files. You must specify all other files in the \c QtCreatorDeployment.txt - file that you create and place in the root directory of the CMake project. + file that you create and place in either the root directory of the CMake + project or the build directory of the active build configuration. + Currently, Qt Creator first checks the root directory and only if no + \c QtCreatorDeployment.txt exists it checks the active build directory. Use the following syntax in the file: diff --git a/doc/src/projects/creator-projects-custom-wizards-json.qdoc b/doc/src/projects/creator-projects-custom-wizards-json.qdoc index 854cfa6ea4..e7b7ba07c8 100644 --- a/doc/src/projects/creator-projects-custom-wizards-json.qdoc +++ b/doc/src/projects/creator-projects-custom-wizards-json.qdoc @@ -308,6 +308,10 @@ \li \c openAsProject opens the project file in \QC if it is set to \c{true}. + \li \c isBinary treats the file as a binary and prevents + replacements from being done in the file if set to + \c true. + \li \c condition generates the file if the condition returns \c{true}. For more information, see \l{Using Variables in Wizards}. diff --git a/doc/src/projects/creator-projects-qbs.qdoc b/doc/src/projects/creator-projects-qbs.qdoc index ebcf8aefd3..84096da901 100644 --- a/doc/src/projects/creator-projects-qbs.qdoc +++ b/doc/src/projects/creator-projects-qbs.qdoc @@ -103,6 +103,15 @@ \li Select \uicontrol {Keep going} to continue building when errors occur, if possible. + \li Select \uicontrol {Show command lines} to print actual command lines + to the compile output pane instead of high-level descriptions. + + \li Select \uicontrol {Install} to copy artifacts to their install location + after building them. This option is enabled by default. + + \li Select \uicontrol {Clean install root} to remove the contents of + the install root directory before the build starts. + \endlist \endlist diff --git a/doc/src/qtquick/qtquick-creating.qdoc b/doc/src/qtquick/qtquick-creating.qdoc index 27c0f2a5d9..997e084ff7 100644 --- a/doc/src/qtquick/qtquick-creating.qdoc +++ b/doc/src/qtquick/qtquick-creating.qdoc @@ -62,8 +62,14 @@ \section1 Creating Qt Quick UI Projects + The \uicontrol {Qt Quick UI} wizard is disabled by default. + \list 1 + \li Select \uicontrol Help > \uicontrol Tools > \uicontrol {About Plugins} > + \uicontrol {Qt Quick} > \uicontrol {QmlProjectManager} and restart \QC to show + the wizard. + \li Select \uicontrol File > \uicontrol {New File or Project} > \uicontrol Application > \uicontrol {Qt Quick UI} > \uicontrol Choose. |