diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2017-04-20 15:32:59 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2017-04-21 16:20:29 +0000 |
| commit | 8397813b617ae8e62a64ed3e3ebda34ffbfaba40 (patch) | |
| tree | 6fae51f384e4da7f8cdf66ce9f302dc524d8846b | |
| parent | 96f182fd975c7fe90f4e54de887d04b633c85383 (diff) | |
libqtprofilesetup: Add a dedicated template file for Qt.qml
A follow-up patch will add custom content.
Change-Id: I0c41d7158a3e1bb24dd31f11be19f9bd9cdc5581
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| -rw-r--r-- | src/lib/qtprofilesetup/qtprofilesetup.cpp | 4 | ||||
| -rw-r--r-- | src/lib/qtprofilesetup/templates.qrc | 1 | ||||
| -rw-r--r-- | src/lib/qtprofilesetup/templates/qml.qbs | 29 |
3 files changed, 34 insertions, 0 deletions
diff --git a/src/lib/qtprofilesetup/qtprofilesetup.cpp b/src/lib/qtprofilesetup/qtprofilesetup.cpp index 2ef2e289a..81dcbbf63 100644 --- a/src/lib/qtprofilesetup/qtprofilesetup.cpp +++ b/src/lib/qtprofilesetup/qtprofilesetup.cpp @@ -181,6 +181,8 @@ static void replaceSpecialValues(QByteArray *content, const Profile &profile, content->replace("@defaultQpaPlugin@", utf8JSLiteral(defaultQpaPlugin(profile, module, qtEnvironment))); } + if (module.qbsName == QLatin1String("qml")) + content->replace("@qmlPath@", pathToJSLiteral(qtEnvironment.qmlPath).toUtf8()); if (module.isStaticLibrary) { if (!propertiesString.isEmpty()) propertiesString += "\n "; @@ -256,6 +258,8 @@ static void createModules(Profile &profile, Settings *settings, moduleTemplateFileName = QLatin1String("dbus.qbs"); copyTemplateFile(QLatin1String("dbus.js"), qbsQtModuleDir, profile, qtEnvironment, &allFiles); + } else if (module.qbsName == QLatin1String("qml")) { + moduleTemplateFileName = QLatin1String("qml.qbs"); } else if (module.qbsName == QLatin1String("phonon")) { moduleTemplateFileName = QLatin1String("phonon.qbs"); } else if (module.isPlugin) { diff --git a/src/lib/qtprofilesetup/templates.qrc b/src/lib/qtprofilesetup/templates.qrc index bcbf2bd67..9c0310750 100644 --- a/src/lib/qtprofilesetup/templates.qrc +++ b/src/lib/qtprofilesetup/templates.qrc @@ -12,5 +12,6 @@ <file>templates/dbus.js</file> <file>templates/dbus.qbs</file> <file>templates/scxml.qbs</file> + <file>templates/qml.qbs</file> </qresource> </RCC> diff --git a/src/lib/qtprofilesetup/templates/qml.qbs b/src/lib/qtprofilesetup/templates/qml.qbs new file mode 100644 index 000000000..36f086add --- /dev/null +++ b/src/lib/qtprofilesetup/templates/qml.qbs @@ -0,0 +1,29 @@ +import qbs 1.0 +import '../QtModule.qbs' as QtModule + +QtModule { + qtModuleName: "Qml" + Depends { name: "Qt"; submodules: @dependencies@} + + property string qmlPath: @qmlPath@ + + hasLibrary: @has_library@ + staticLibsDebug: @staticLibsDebug@ + staticLibsRelease: @staticLibsRelease@ + dynamicLibsDebug: @dynamicLibsDebug@ + dynamicLibsRelease: @dynamicLibsRelease@ + linkerFlagsDebug: @linkerFlagsDebug@ + linkerFlagsRelease: @linkerFlagsRelease@ + frameworksDebug: @frameworksDebug@ + frameworksRelease: @frameworksRelease@ + frameworkPathsDebug: @frameworkPathsDebug@ + frameworkPathsRelease: @frameworkPathsRelease@ + libNameForLinkerDebug: @libNameForLinkerDebug@ + libNameForLinkerRelease: @libNameForLinkerRelease@ + libFilePathDebug: @libFilePathDebug@ + libFilePathRelease: @libFilePathRelease@ + cpp.defines: @defines@ + cpp.includePaths: @includes@ + cpp.libraryPaths: @libraryPaths@ + @special_properties@ +} |