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

SDKTool: Fix compile for Qt5.6

Browse Source 
Change-Id: I9154ffbc09187a851c409b2b1ae9d2d8109f1c15
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Christian Stenger
2016-07-20 10:58:54 +02:00
parent a48acdff52
commit 2281386199
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/tools/sdktool/addkitoperation.cpp
View File

@@ -74,17 +74,18 @@ AddKitOperation::AddKitOperation()
QString AddKitOperation::name() const QString AddKitOperation::name() const
{ {
return "addKit"; return QString("addKit");
} }
QString AddKitOperation::helpText() const QString AddKitOperation::helpText() const
{ {
return "add a Kit to Qt Creator"; return QString("add a Kit to Qt Creator");
} }
QString AddKitOperation::argumentsHelpText() const QString AddKitOperation::argumentsHelpText() const
{ {
return " --id <ID> id of the new kit (required).\n" return QString(
" --id <ID> id of the new kit (required).\n"
" --name <NAME> display name of the new kit (required).\n" " --name <NAME> display name of the new kit (required).\n"
" --icon <PATH> icon of the new kit.\n" " --icon <PATH> icon of the new kit.\n"
" --debuggerid <ID> the id of the debugger to use.\n" " --debuggerid <ID> the id of the debugger to use.\n"
@@ -98,7 +99,7 @@ QString AddKitOperation::argumentsHelpText() const
" --qt <ID> Qt of the new kit.\n" " --qt <ID> Qt of the new kit.\n"
" --mkspec <PATH> mkspec of the new kit.\n" " --mkspec <PATH> mkspec of the new kit.\n"
" --env <VALUE> add a custom environment setting. [may be repeated]\n" " --env <VALUE> add a custom environment setting. [may be repeated]\n"
" <KEY> <TYPE:VALUE> extra key value pairs\n"; " <KEY> <TYPE:VALUE> extra key value pairs\n");
} }
bool AddKitOperation::setArguments(const QStringList &args) bool AddKitOperation::setArguments(const QStringList &args)

9
src/tools/sdktool/addtoolchainoperation.cpp
View File

@@ -54,22 +54,23 @@ const char SUPPORTED_ABIS[] = "ProjectExplorer.GccToolChain.SupportedAbis";
QString AddToolChainOperation::name() const QString AddToolChainOperation::name() const
{ {
return "addTC"; return QString("addTC");
} }
QString AddToolChainOperation::helpText() const QString AddToolChainOperation::helpText() const
{ {
return "add a tool chain to Qt Creator"; return QString("add a tool chain to Qt Creator");
} }
QString AddToolChainOperation::argumentsHelpText() const QString AddToolChainOperation::argumentsHelpText() const
{ {
return " --id <ID> id of the new tool chain (required).\n" return QString(
" --id <ID> id of the new tool chain (required).\n"
" --name <NAME> display name of the new tool chain (required).\n" " --name <NAME> display name of the new tool chain (required).\n"
" --path <PATH> path to the compiler (required).\n" " --path <PATH> path to the compiler (required).\n"
" --abi <ABI STRING> ABI of the compiler (required).\n" " --abi <ABI STRING> ABI of the compiler (required).\n"
" --supportedAbis <ABI STRING>,<ABI STRING> list of ABIs supported by the compiler.\n" " --supportedAbis <ABI STRING>,<ABI STRING> list of ABIs supported by the compiler.\n"
" <KEY> <TYPE:VALUE> extra key value pairs\n"; " <KEY> <TYPE:VALUE> extra key value pairs\n");
} }
bool AddToolChainOperation::setArguments(const QStringList &args) bool AddToolChainOperation::setArguments(const QStringList &args)

6
src/tools/sdktool/rmtoolchainoperation.cpp
View File

@@ -43,17 +43,17 @@ const char ID[] = "ProjectExplorer.ToolChain.Id";
QString RmToolChainOperation::name() const QString RmToolChainOperation::name() const
{ {
return "rmTC"; return QString("rmTC");
} }
QString RmToolChainOperation::helpText() const QString RmToolChainOperation::helpText() const
{ {
return "remove a tool chain from Qt Creator"; return QString("remove a tool chain from Qt Creator");
} }
QString RmToolChainOperation::argumentsHelpText() const QString RmToolChainOperation::argumentsHelpText() const
{ {
return " --id <ID> The id of the tool chain to remove.\n"; return QString(" --id <ID> The id of the tool chain to remove.\n");
} }
bool RmToolChainOperation::setArguments(const QStringList &args) bool RmToolChainOperation::setArguments(const QStringList &args)