diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2012-10-09 11:50:17 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2012-10-09 11:50:17 +0200 |
| commit | d5d1c5e394b398fc138f2f9b00ec0aa5ab80a1ec (patch) | |
| tree | 37256a557227e20a6c78278439c4478f4a892c17 /qbs | |
| parent | 8ec446efdc7f1d5b693df610ab3b8931712c2bd1 (diff) | |
| parent | 2b56943a8e6efa4e60c14b11afc8d9fefcca13eb (diff) | |
Merge remote-tracking branch 'origin/2.6'
Conflicts:
src/libs/utils/fileutils.cpp
src/plugins/remotelinux/deployablefilesperprofile.cpp
src/plugins/remotelinux/genericdirectuploadservice.cpp
src/tools/qtcreatorcrashhandler/main.cpp
Change-Id: I830287691e7085fe9c94597e23ec7be64eb8be42
Diffstat (limited to 'qbs')
| -rw-r--r-- | qbs/pluginspec/pluginspec.qbs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qbs/pluginspec/pluginspec.qbs b/qbs/pluginspec/pluginspec.qbs index 0e616df338..dea785fe29 100644 --- a/qbs/pluginspec/pluginspec.qbs +++ b/qbs/pluginspec/pluginspec.qbs @@ -4,7 +4,7 @@ import qbs.fileinfo 1.0 as FileInfo Module { Depends { id: qtcore; name: "Qt.core" } - additionalProductFileTags: qtcore.versionMajor < 5 ? ["pluginSpec"] : ["pluginJSON"] + additionalProductFileTags: qtcore.versionMajor < 5 ? ["pluginSpec"] : ["qt_plugin_metadata"] property int ide_version_major: project.ide_version_major property int ide_version_minor: project.ide_version_minor property int ide_version_release: project.ide_version_release @@ -71,7 +71,7 @@ Module { inputs: ["pluginSpec"] Artifact { - fileTags: ["pluginJSON"] + fileTags: ["qt_plugin_metadata"] fileName: { var destdir = FileInfo.joinPaths(product.modules["qt/core"].generatedFilesDir, input.fileName); |