aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/qtprofilesetup
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2018-02-13 09:24:42 +0100
committerJoerg Bornemann <joerg.bornemann@qt.io>2018-02-16 12:27:50 +0000
commit3376d229b8701ba8d8b5d4ff08398a4a8ca2e91d (patch)
treecf1cfc401df596c670ed680384a932ef93aaaecf /src/lib/qtprofilesetup
parent067b4527b732394b15f845f3a6082249092b99d5 (diff)
Qt templates: Rename special_properties to additionalContent
We will add non-property content in a subsequent commit. Change-Id: I1321b20de7af11e76201a5ffdb8a8e389102eeba Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/lib/qtprofilesetup')
-rw-r--r--src/lib/qtprofilesetup/qtprofilesetup.cpp12
-rw-r--r--src/lib/qtprofilesetup/templates/dbus.qbs2
-rw-r--r--src/lib/qtprofilesetup/templates/gui.qbs2
-rw-r--r--src/lib/qtprofilesetup/templates/module.qbs2
-rw-r--r--src/lib/qtprofilesetup/templates/plugin.qbs2
-rw-r--r--src/lib/qtprofilesetup/templates/qml.qbs2
-rw-r--r--src/lib/qtprofilesetup/templates/quick.qbs2
-rw-r--r--src/lib/qtprofilesetup/templates/scxml.qbs2
8 files changed, 13 insertions, 13 deletions
diff --git a/src/lib/qtprofilesetup/qtprofilesetup.cpp b/src/lib/qtprofilesetup/qtprofilesetup.cpp
index d8760ff80..79cc6f65a 100644
--- a/src/lib/qtprofilesetup/qtprofilesetup.cpp
+++ b/src/lib/qtprofilesetup/qtprofilesetup.cpp
@@ -465,7 +465,7 @@ static void replaceSpecialValues(QByteArray *content, const Profile &profile,
dict.insert("minWatchosVersion", minVersionJsString(qtEnvironment.watchosVersion));
dict.insert("minAndroidVersion", minVersionJsString(qtEnvironment.androidVersion));
- QByteArray propertiesString;
+ QByteArray additionalContent;
QByteArray compilerDefines = utf8JSLiteral(module.compilerDefines);
if (module.qbsName == QLatin1String("declarative")
|| module.qbsName == QLatin1String("quick")) {
@@ -474,7 +474,7 @@ static void replaceSpecialValues(QByteArray *content, const Profile &profile,
? "QT_DECLARATIVE_DEBUG" : "QT_QML_DEBUG";
const QString indent = QLatin1String(" ");
- QTextStream s(&propertiesString);
+ QTextStream s(&additionalContent);
s << "property bool qmlDebugging: false" << endl;
s << indent << "property string qmlPath";
if (qtEnvironment.qmlPath.isEmpty())
@@ -506,13 +506,13 @@ static void replaceSpecialValues(QByteArray *content, const Profile &profile,
if (module.qbsName == QLatin1String("qml"))
dict.insert("qmlPath", pathToJSLiteral(qtEnvironment.qmlPath).toUtf8());
if (module.isStaticLibrary) {
- if (!propertiesString.isEmpty())
- propertiesString += "\n ";
- propertiesString += "isStaticLibrary: true";
+ if (!additionalContent.isEmpty())
+ additionalContent += "\n ";
+ additionalContent += "isStaticLibrary: true";
}
if (module.isPlugin)
dict.insert("className", utf8JSLiteral(module.pluginData.className));
- dict.insert("special_properties", propertiesString);
+ dict.insert("additionalContent", additionalContent);
for (std::pair<int, int> pos = findVariable(*content, 0); pos.first != -1;
pos = findVariable(*content, pos.first)) {
diff --git a/src/lib/qtprofilesetup/templates/dbus.qbs b/src/lib/qtprofilesetup/templates/dbus.qbs
index 5cace7f4f..2bbcf1985 100644
--- a/src/lib/qtprofilesetup/templates/dbus.qbs
+++ b/src/lib/qtprofilesetup/templates/dbus.qbs
@@ -68,6 +68,6 @@ QtModule {
cpp.includePaths: @includes@
cpp.libraryPaths: @libraryPaths@
- @special_properties@
+ @additionalContent@
}
diff --git a/src/lib/qtprofilesetup/templates/gui.qbs b/src/lib/qtprofilesetup/templates/gui.qbs
index 1653601ec..81b3bc2fb 100644
--- a/src/lib/qtprofilesetup/templates/gui.qbs
+++ b/src/lib/qtprofilesetup/templates/gui.qbs
@@ -60,6 +60,6 @@ QtModule {
"Foundation", "CoreFoundation", "AudioToolbox"])
}
cpp.frameworks: base
- @special_properties@
+ @additionalContent@
}
diff --git a/src/lib/qtprofilesetup/templates/module.qbs b/src/lib/qtprofilesetup/templates/module.qbs
index 4740e5d52..d16307e32 100644
--- a/src/lib/qtprofilesetup/templates/module.qbs
+++ b/src/lib/qtprofilesetup/templates/module.qbs
@@ -25,5 +25,5 @@ QtModule {
cpp.defines: @defines@
cpp.includePaths: @includes@
cpp.libraryPaths: @libraryPaths@
- @special_properties@
+ @additionalContent@
}
diff --git a/src/lib/qtprofilesetup/templates/plugin.qbs b/src/lib/qtprofilesetup/templates/plugin.qbs
index ca9803b1b..378d8b8fe 100644
--- a/src/lib/qtprofilesetup/templates/plugin.qbs
+++ b/src/lib/qtprofilesetup/templates/plugin.qbs
@@ -23,5 +23,5 @@ QtPlugin {
libFilePathDebug: @libFilePathDebug@
libFilePathRelease: @libFilePathRelease@
cpp.libraryPaths: @libraryPaths@
- @special_properties@
+ @additionalContent@
}
diff --git a/src/lib/qtprofilesetup/templates/qml.qbs b/src/lib/qtprofilesetup/templates/qml.qbs
index 0ebc016f2..95b5d2790 100644
--- a/src/lib/qtprofilesetup/templates/qml.qbs
+++ b/src/lib/qtprofilesetup/templates/qml.qbs
@@ -42,7 +42,7 @@ QtModule {
cpp.defines: @defines@
cpp.includePaths: @includes@
cpp.libraryPaths: @libraryPaths@
- @special_properties@
+ @additionalContent@
FileTagger {
patterns: ["*.qml"]
diff --git a/src/lib/qtprofilesetup/templates/quick.qbs b/src/lib/qtprofilesetup/templates/quick.qbs
index 539fbfee6..b61806836 100644
--- a/src/lib/qtprofilesetup/templates/quick.qbs
+++ b/src/lib/qtprofilesetup/templates/quick.qbs
@@ -59,7 +59,7 @@ QtModule {
cpp.defines: @defines@
cpp.includePaths: @includes@
cpp.libraryPaths: @libraryPaths@
- @special_properties@
+ @additionalContent@
Scanner {
condition: compilerAvailable
inputs: 'qt.quick.qrc'
diff --git a/src/lib/qtprofilesetup/templates/scxml.qbs b/src/lib/qtprofilesetup/templates/scxml.qbs
index f40593637..0581ff8d3 100644
--- a/src/lib/qtprofilesetup/templates/scxml.qbs
+++ b/src/lib/qtprofilesetup/templates/scxml.qbs
@@ -75,5 +75,5 @@ QtModule {
cpp.includePaths: @includes@
cpp.libraryPaths: @libraryPaths@
- @special_properties@
+ @additionalContent@
}