diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2012-11-27 11:50:56 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2012-11-27 11:50:56 +0100 |
| commit | ba1d5f2cdf7d31eb862f02bd42885cdba13a7f15 (patch) | |
| tree | 5c9d0551e67612724a2ca0328636b091653c1f00 /share/share.qbs | |
| parent | c384f52b49f0eddc7a7f8e622e1485ebb1018028 (diff) | |
| parent | deeef5308f1b3d59581aa1a65e781d434719a40d (diff) | |
| download | qt-creator-ba1d5f2cdf7d31eb862f02bd42885cdba13a7f15.tar.gz | |
Merge remote-tracking branch 'origin/2.6'
Conflicts:
share/share.qbs
src/plugins/cpptools/cppchecksymbols.cpp
src/plugins/texteditor/behaviorsettingswidget.cpp
Change-Id: Ia34060984f9c036b2f28a6411d796d41f55a3e37
Diffstat (limited to 'share/share.qbs')
| -rw-r--r-- | share/share.qbs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/share/share.qbs b/share/share.qbs index f2fa15eaa4..fcfc8e5b66 100644 --- a/share/share.qbs +++ b/share/share.qbs @@ -19,8 +19,6 @@ Product { } Group { - condition: qbs.targetOS == "macx" - qbs.installDir: "share/qtcreator/scripts" fileTags: ["install"] files: "qtcreator/scripts/openTerminal.command" } |