aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiguel Costa <miguel.costa@qt.io>2018-11-27 15:46:01 +0100
committerMiguel Costa <miguel.costa@qt.io>2018-11-28 09:45:04 +0000
commite2445defc5a80667a4afc5f9edf1f52845f25e81 (patch)
tree039ce1b74eac192cee0b1e9790f49024a56d31dd
parent1276cab4de6a4aa0007b39818932966d8d083ef5 (diff)
Change user-visible occurrences of "QML Cache" to "Qt Quick Compiler"
This description is more consistent with the Qt documentation: http://doc.qt.io/qt-5/qtquick-deployment.html#compiling-qml-ahead-of-time Change-Id: I0ee3377d26bfd4ed8bed196bde371910162c6777 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
-rw-r--r--src/qtmsbuild/qt.props6
-rw-r--r--src/qtmsbuild/qtrcc.xml6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/qtmsbuild/qt.props b/src/qtmsbuild/qt.props
index a965d981..c885df0d 100644
--- a/src/qtmsbuild/qt.props
+++ b/src/qtmsbuild/qt.props
@@ -77,13 +77,13 @@
<!--
// QML cache generation -->
<QmlCacheGenMessage
- ><![CDATA[QML cache: generating cache for %<Identity>...]]></QmlCacheGenMessage>
+ ><![CDATA[Qt Quick Compiler: compiling %<Identity> ahead of time]]></QmlCacheGenMessage>
<QmlCacheOutputFile
><![CDATA[$(ProjectDir)GeneratedFiles\%<Filename>_%<Suffix>.cpp]]></QmlCacheOutputFile>
<!--
// QRC filtering -->
<QmlCacheFilterMessage
- >QML cache: filtering %(Identity)...</QmlCacheFilterMessage>
+ >Qt Quick Compiler: filtering %(Identity)...</QmlCacheFilterMessage>
<QmlCacheFilteredFile
>$(ProjectDir)GeneratedFiles\%(Filename)_qmlcache.qrc</QmlCacheFilteredFile>
<QmlCacheFilteredOutputFile
@@ -93,7 +93,7 @@
<!--
// QML cache loader generation -->
<QmlCacheLoaderMessage
- >QML cache: generating cache loader...</QmlCacheLoaderMessage>
+ >Qt Quick Compiler: generating cache loader...</QmlCacheLoaderMessage>
<QmlCacheLoaderFile
>$(ProjectDir)GeneratedFiles\qmlcache_loader.cpp</QmlCacheLoaderFile>
</QtRcc>
diff --git a/src/qtmsbuild/qtrcc.xml b/src/qtmsbuild/qtrcc.xml
index 34535d56..065f1c37 100644
--- a/src/qtmsbuild/qtrcc.xml
+++ b/src/qtmsbuild/qtrcc.xml
@@ -63,7 +63,7 @@
<Category
Name="QMLCache">
<Category.DisplayName>
- <sys:String>QML Cache</sys:String>
+ <sys:String>Qt Quick Compiler</sys:String>
</Category.DisplayName>
</Category>
</Rule.Categories>
@@ -327,8 +327,8 @@
<BoolProperty
Name="QmlCacheGenerate"
Category="QMLCache"
- DisplayName="Generate QML Cache"
- Description="Enable or disable the generation of QML cache." />
+ DisplayName="Enable Qt Quick Compiler"
+ Description="Enable or disable ahead-of-time compilation using the Qt Quick Compiler." />
<!--
// QML cache generation -->
<StringProperty