aboutsummaryrefslogtreecommitdiffstats
path: root/tools/qmlimportscanner
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-11-13 08:30:21 +0100
committerFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-11-16 08:42:27 +0000
commitb35301f0b1ff88bf99ba1e88c4a14bc54431853d (patch)
tree09a8002f703c1dc4ca21ca10d0427d41da3e253a /tools/qmlimportscanner
parent805cb851fdd26b30fe2a1ef27e3e429d319ea335 (diff)
qmlimportscanner: Improve command line help.
Output example line containing the Qt import path ready for copy & paste. Task-number: QTBUG-48424 Change-Id: I44d0793ade4322d376ed2b72e5c3935b19ba2c7d Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'tools/qmlimportscanner')
-rw-r--r--tools/qmlimportscanner/main.cpp19
1 files changed, 13 insertions, 6 deletions
diff --git a/tools/qmlimportscanner/main.cpp b/tools/qmlimportscanner/main.cpp
index 56cca8fcb4..b16253a192 100644
--- a/tools/qmlimportscanner/main.cpp
+++ b/tools/qmlimportscanner/main.cpp
@@ -60,13 +60,20 @@ QT_USE_NAMESPACE
QStringList g_qmlImportPaths;
-void printUsage(const QString &appName)
+static void printUsage(const QString &appNameIn)
{
- std::cerr << qPrintable(QString::fromLatin1(
- "Usage: %1 -rootPath path/to/app/qml/directory -importPath path/to/qt/qml/directory \n"
- " %1 -qmlFiles file1 file2 -importPath path/to/qt/qml/directory \n"
- "Example: %1 -rootPath . -importPath /home/user/dev/qt-install/qml \n").arg(
- appName));
+ const std::wstring appName = appNameIn.toStdWString();
+#ifndef QT_BOOTSTRAPPED
+ const QString qmlPath = QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath);
+#else
+ const QString qmlPath = QStringLiteral("/home/user/dev/qt-install/qml");
+#endif
+ std::wcerr
+ << "Usage: " << appName << " -rootPath path/to/app/qml/directory -importPath path/to/qt/qml/directory\n"
+ " " << appName << " -qmlFiles file1 file2 -importPath path/to/qt/qml/directory\n\n"
+ "Example: " << appName << " -rootPath . -importPath "
+ << QDir::toNativeSeparators(qmlPath).toStdWString()
+ << '\n';
}
QVariantList findImportsInAst(QQmlJS::AST::UiHeaderItemList *headerItemList, const QString &code, const QString &path)