feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Wizards: Use filename, not baseName for license headers

Browse Source 
Task-number: QTCREATORBUG-17343
Change-Id: I23ae4b510bb2dc81bd34253e8129ba148ae92021
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Tobias Hunger
2016-11-25 14:45:59 +01:00
parent b74c33d7a7
commit 565aed03a2
4 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
share/qtcreator/templates/wizards/files/cppheader/wizard.json
View File

@@ -32,7 +32,7 @@
"source": "file.h", "source": "file.h",
"target": "%{FileName}", "target": "%{FileName}",
"openInEditor": true, "openInEditor": true,
"options": { "key": "Cpp:License:FileName", "value": "%{JS: Util.completeBaseName('%{FileName}')}" } "options": { "key": "Cpp:License:FileName", "value": "%{JS: Util.fileName('%{FileName}')}" }
} }
} }
] ]

2
share/qtcreator/templates/wizards/files/cppsource/wizard.json
View File

@@ -32,7 +32,7 @@
"source": "file.cpp", "source": "file.cpp",
"target": "%{FileName}", "target": "%{FileName}",
"openInEditor": true, "openInEditor": true,
"options": { "key": "Cpp:License:FileName", "value": "%{JS: Util.completeBaseName('%{FileName}')}" } "options": { "key": "Cpp:License:FileName", "value": "%{JS: Util.fileName('%{FileName}')}" }
} }
} }
] ]

6
src/plugins/coreplugin/corejsextensions.cpp
View File

@@ -52,6 +52,12 @@ QString UtilsJsExtension::baseName(const QString &in) const
return fi.baseName(); return fi.baseName();
} }
QString UtilsJsExtension::fileName(const QString &in) const
{
QFileInfo fi(in);
return fi.fileName();
}
QString UtilsJsExtension::completeBaseName(const QString &in) const QString UtilsJsExtension::completeBaseName(const QString &in) const
{ {
QFileInfo fi(in); QFileInfo fi(in);

1
src/plugins/coreplugin/corejsextensions.h
View File

@@ -46,6 +46,7 @@ public:
Q_INVOKABLE QString fromNativeSeparators(const QString &in) const; Q_INVOKABLE QString fromNativeSeparators(const QString &in) const;
Q_INVOKABLE QString baseName(const QString &in) const; Q_INVOKABLE QString baseName(const QString &in) const;
Q_INVOKABLE QString fileName(const QString &in) const;
Q_INVOKABLE QString completeBaseName(const QString &in) const; Q_INVOKABLE QString completeBaseName(const QString &in) const;
Q_INVOKABLE QString suffix(const QString &in) const; Q_INVOKABLE QString suffix(const QString &in) const;
Q_INVOKABLE QString completeSuffix(const QString &in) const; Q_INVOKABLE QString completeSuffix(const QString &in) const;