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

QmlDump: Update for changes in qtquick2.

Browse Source
This commit is contained in:
Christian Kamm
2011-04-28 12:19:16 +02:00
parent 34e354c8fe
commit a448f2b61a
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -399,7 +399,7 @@ enum ExitCode {
#ifdef Q_OS_UNIX
void sigSegvHandler(int) {
fprintf(stderr, "Error: qmldump SEGV\n");
fprintf(stderr, "Error: SEGV\n");
if (!currentProperty.isEmpty())
fprintf(stderr, "While processing the property '%s', which probably has uninitialized data.\n", currentProperty.toLatin1().constData());
exit(EXIT_SEGV);
@@ -409,9 +409,9 @@ void sigSegvHandler(int) {
void printUsage(const QString &appName)
{
qWarning() << qPrintable(QString(
"Usage: %1 [--notrelocatable] module.uri version [module/import/path]\n"
" %1 --path path/to/qmldir/directory [version]\n"
" %1 --builtins\n"
"Usage: %1 [-notrelocatable] module.uri version [module/import/path]\n"
" %1 -path path/to/qmldir/directory [version]\n"
" %1 -builtins\n"
"Example: %1 Qt.labs.particles 4.7 /home/user/dev/qt-install/imports").arg(
appName));
}
@@ -437,7 +437,10 @@ int main(int argc, char *argv[])
QApplication app(argc, argv);
const QStringList args = app.arguments();
const QString appName = QFileInfo(app.applicationFilePath()).baseName();
if (!(args.size() >= 3 || (args.size() == 2 && args.at(1) == QLatin1String("--builtins")))) {
if (!(args.size() >= 3
|| (args.size() == 2
&& (args.at(1) == QLatin1String("--builtins")
|| args.at(1) == QLatin1String("-builtins"))))) {
printUsage(appName);
return EXIT_INVALIDARGUMENTS;
}
@@ -450,14 +453,16 @@ int main(int argc, char *argv[])
if (args.size() >= 3) {
QStringList positionalArgs;
foreach (const QString &arg, args) {
if (!arg.startsWith("--")) {
if (!arg.startsWith(QLatin1Char('-'))) {
positionalArgs.append(arg);
continue;
}
if (arg == QLatin1String("--notrelocatable")) {
if (arg == QLatin1String("--notrelocatable")
|| arg == QLatin1String("-notrelocatable")) {
relocatable = false;
} else if (arg == QLatin1String("--path")) {
} else if (arg == QLatin1String("--path")
|| arg == QLatin1String("-path")) {
pathImport = true;
} else {
qWarning() << "Invalid argument: " << arg;