diff --git a/doc/qtcreator/src/projects/creator-only/creator-build-settings-qmake.qdoc b/doc/qtcreator/src/projects/creator-only/creator-build-settings-qmake.qdoc index eec535a6887..2cf107f1ed2 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-build-settings-qmake.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-build-settings-qmake.qdoc @@ -82,19 +82,16 @@ \section1 Compiling QML - Since Qt 5.11, you can compile QML source code into the final binary. This - improves the startup time of the application and eliminates the need to - deploy QML files together with the application. For more information, see + You can compile QML source code into the final binary to improve the + startup time of the application and eliminate the need to deploy QML + files together with the application. For more information, see \l{Ahead-of-Time Compilation}. - \QC project wizard templates create Qt Quick projects that can be compiled, + \QC project wizard templates create Qt Quick projects that can be compiled because they are set up to use the Qt Resource System. To compile QML code, - select \uicontrol Enable in the \uicontrol {Qt Quick Compiler} field. To + select \uicontrol Enable in the \uicontrol {Use qmlcachegen} field. To use default settings, select \uicontrol {Leave at Default}. - \note In earlier Qt versions, this was a commercial feature. For more - information, see \l{http://doc.qt.io/QtQuickCompiler/}{Qt Quick Compiler}. - \section1 qmake Build Steps \QC builds qmake projects by running the \c make or \c nmake command from diff --git a/src/plugins/projectexplorer/buildpropertiessettings.cpp b/src/plugins/projectexplorer/buildpropertiessettings.cpp index ff84d4ac891..f229d9c37a6 100644 --- a/src/plugins/projectexplorer/buildpropertiessettings.cpp +++ b/src/plugins/projectexplorer/buildpropertiessettings.cpp @@ -70,7 +70,7 @@ BuildPropertiesSettings::BuildPropertiesSettings() registerAspect(&qtQuickCompiler); qtQuickCompiler.setSettingsKey("ProjectExplorer/Settings/QtQuickCompiler"); - qtQuickCompiler.setLabelText(tr("Use Qt Quick Compiler:")); + qtQuickCompiler.setLabelText(tr("Use qmlcachegen:")); QObject::connect(&showQtSettings, &BoolAspect::valueChanged, &qmlDebugging, &BaseAspect::setVisible);