diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2012-10-18 10:40:11 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2012-10-18 10:40:11 +0200 |
| commit | 49d5c2381a479b735913d4187de9e5111ded9e85 (patch) | |
| tree | 3e69654ec2692d5bef98cd22bbdcc65155c43c1e /src/plugins/QtcPlugin.qbs | |
| parent | 49e7ec748ee61fa07cbce9a94a564f13219b3d69 (diff) | |
| parent | d8e6a314e521eff5500242e6eb65f29d45e769b8 (diff) | |
| download | qt-creator-49d5c2381a479b735913d4187de9e5111ded9e85.tar.gz | |
Merge remote-tracking branch 'origin/2.6'
Conflicts:
qtcreator.pri
qtcreator.qbp
src/libs/3rdparty/botan/botan.qbs
src/libs/ssh/ssh.qbs
src/plugins/qnx/blackberryqtversion.cpp
Change-Id: Ie8d16d636528aab4006310eab47a342fdf2634d9
Diffstat (limited to 'src/plugins/QtcPlugin.qbs')
| -rw-r--r-- | src/plugins/QtcPlugin.qbs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/QtcPlugin.qbs b/src/plugins/QtcPlugin.qbs index bc979b7fe7..03e3155a65 100644 --- a/src/plugins/QtcPlugin.qbs +++ b/src/plugins/QtcPlugin.qbs @@ -36,7 +36,7 @@ Product { cpp.includePaths: [ ".", ".." ] Group { - files: [ name + ".pluginspec.in" ] + files: [ product.name + ".pluginspec.in" ] fileTags: ["pluginSpecIn"] } } |