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

Merge remote-tracking branch 'origin/2.7'

Browse Source 
Conflicts:
	src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp

Change-Id: I4e0a85795e7f4bfcdc21d106517517b527f85104
This commit is contained in:
Eike Ziller
2013-04-30 11:43:33 +02:00
parent 3aa0e50039 71f1919de9
commit bedc477943
39 changed files with 267 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
share/qtcreator/qml/qmldump/main.cpp
View File

@@ -464,7 +464,7 @@ void sigSegvHandler(int) {
void printUsage(const QString &appName)
{
qWarning() << qPrintable(QString(
"Usage: %1 [-v] [-notrelocatable] module.uri version [module/import/path]\n"
"Usage: %1 [-v] [-[non]relocatable] module.uri version [module/import/path]\n"
" %1 [-v] -path path/to/qmldir/directory [version]\n"
" %1 [-v] -builtins\n"
"Example: %1 Qt.labs.particles 4.7 /home/user/dev/qt-install/imports").arg(
@@ -511,8 +511,13 @@ int main(int argc, char *argv[])
}
if (arg == QLatin1String("--notrelocatable")
|| arg == QLatin1String("-notrelocatable")) {
|| arg == QLatin1String("-notrelocatable")
|| arg == QLatin1String("--nonrelocatable")
|| arg == QLatin1String("-nonrelocatable")) {
relocatable = false;
} else if (arg == QLatin1String("--relocatable")
|| arg == QLatin1String("-relocatable")) {
relocatable = true;
} else if (arg == QLatin1String("--path")
|| arg == QLatin1String("-path")) {
action = Path;