diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2016-07-11 10:46:05 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2016-07-11 10:46:05 +0200 |
| commit | 546df37c9894c5d444e3c40a21110077b8dc7a44 (patch) | |
| tree | 15e4ac4676373bdd25ccac527baca38706d15368 /qbs/imports | |
| parent | 717ff381401d559a338c1d4613c6af53735dcb91 (diff) | |
| parent | 9650adad140dbcec0ee5f464c2bbcb9d9da05133 (diff) | |
| download | qt-creator-546df37c9894c5d444e3c40a21110077b8dc7a44.tar.gz | |
Merge remote-tracking branch 'origin/4.1'
Conflicts:
README.md
src/plugins/modeleditor/actionhandler.cpp
Change-Id: I65c2885593b881eda94872168a3891cab9cafe71
Diffstat (limited to 'qbs/imports')
| -rw-r--r-- | qbs/imports/QtcPlugin.qbs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qbs/imports/QtcPlugin.qbs b/qbs/imports/QtcPlugin.qbs index c81d2bdf14..7e2488eb49 100644 --- a/qbs/imports/QtcPlugin.qbs +++ b/qbs/imports/QtcPlugin.qbs @@ -25,7 +25,7 @@ QtcProduct { name: "Qt.test" } - cpp.createSymlinks: false + cpp.internalVersion: "" cpp.defines: base.concat([name.toUpperCase() + "_LIBRARY"]) cpp.sonamePrefix: qbs.targetOS.contains("osx") ? "@rpath" |