diff options
| -rw-r--r-- | tools/qmlimportscanner/main.cpp | 6 | ||||
| -rw-r--r-- | tools/qmlplugindump/main.cpp | 12 |
2 files changed, 4 insertions, 14 deletions
diff --git a/tools/qmlimportscanner/main.cpp b/tools/qmlimportscanner/main.cpp index 15ff387486..605ea03400 100644 --- a/tools/qmlimportscanner/main.cpp +++ b/tools/qmlimportscanner/main.cpp @@ -79,14 +79,14 @@ inline QString preferLiteral() { return QStringLiteral("prefer"); } void printUsage(const QString &appNameIn) { - const std::wstring appName = appNameIn.toStdWString(); + const std::string appName = appNameIn.toStdString(); const QString qmlPath = QLibraryInfo::path(QLibraryInfo::QmlImportsPath); - std::wcerr + std::cerr << "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" " " << appName << " -qrcFiles file1.qrc file2.qrc -importPath path/to/qt/qml/directory\n\n" "Example: " << appName << " -rootPath . -importPath " - << QDir::toNativeSeparators(qmlPath).toStdWString() + << QDir::toNativeSeparators(qmlPath).toStdString() << '\n'; } diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp index d594736c76..de1e03695e 100644 --- a/tools/qmlplugindump/main.cpp +++ b/tools/qmlplugindump/main.cpp @@ -991,19 +991,9 @@ void compactDependencies(QStringList *dependencies) } } -inline std::wostream &operator<<(std::wostream &str, const QString &s) -{ -#ifdef Q_OS_WIN - str << reinterpret_cast<const wchar_t *>(s.utf16()); -#else - str << s.toStdWString(); -#endif - return str; -} - void printDebugMessage(QtMsgType, const QMessageLogContext &, const QString &msg) { - std::wcerr << msg << std::endl; + std::cerr << msg.toStdString() << std::endl; // In case of QtFatalMsg the calling code will abort() when appropriate. } |