diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-01-17 09:30:57 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-01-17 09:30:57 +0100 |
| commit | 115afed94b8e85db29b0c057e7c143a3d053d6cc (patch) | |
| tree | 7663d95ed448c963ab8b913b675a78f0dea65fdc /qbs | |
| parent | 76bc20ffceadfff894dfd98a0285ae52577be3bf (diff) | |
| parent | 2765409d2bdc79753f96bf6bb894b2884ac5b0cd (diff) | |
Merge remote-tracking branch 'origin/4.6'
Conflicts:
tests/unit/unittest/gtest-creator-printing.cpp
tests/unit/unittest/gtest-creator-printing.h
Change-Id: I43d2571617bfbf41c0fcf23502ab77975540eba4
Diffstat (limited to 'qbs')
| -rw-r--r-- | qbs/modules/qtc/qtc.qbs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/qbs/modules/qtc/qtc.qbs b/qbs/modules/qtc/qtc.qbs index 4b4796e63a..0177c20564 100644 --- a/qbs/modules/qtc/qtc.qbs +++ b/qbs/modules/qtc/qtc.qbs @@ -18,14 +18,16 @@ Module { + ide_compat_version_minor + '.' + ide_compat_version_release property string qtcreator_copyright_year: '2017' + property string qtcreator_copyright_string: "(C) " + qtcreator_copyright_year + " The Qt Company Ltd" property string ide_display_name: 'Qt Creator' property string ide_id: 'qtcreator' property string ide_cased_id: 'QtCreator' + property string ide_bundle_identifier: 'org.qt-project.qtcreator' property string libDirName: "lib" property string ide_app_path: qbs.targetOS.contains("macos") ? "" : "bin" - property string ide_app_target: qbs.targetOS.contains("macos") ? "Qt Creator" : "qtcreator" + property string ide_app_target: qbs.targetOS.contains("macos") ? ide_display_name : ide_id property string ide_library_path: { if (qbs.targetOS.contains("macos")) return ide_app_target + ".app/Contents/Frameworks" |