From 9965d9a14f8646547ed5ca45c0b1d4633ba82cf2 Mon Sep 17 00:00:00 2001
From: Robert Griebl <robert.griebl@qt.io>
Date: Fri, 21 Jul 2023 15:10:49 +0200
Subject: Fix QString/QByteArray mixup

Change-Id: Ia911c8d38eef46f22d86c475e3ef5729e761bd8c
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
(cherry picked from commit c866f30343ad0719b38e5d0810f09b5181fd00b9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 src/tools/controller/controller.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/tools/controller/controller.cpp b/src/tools/controller/controller.cpp
index d079106e..a52631ac 100644
--- a/src/tools/controller/controller.cpp
+++ b/src/tools/controller/controller.cpp
@@ -997,16 +997,16 @@ void listInstances()
 
     QDirIterator dit(dir, { u'*' % suffix });
     while (dit.hasNext()) {
-        QByteArray name = dit.next().toLocal8Bit();
+        QString name = dit.next();
         name.chop(suffix.length());
         name = name.mid(dir.length());
         if (name.isEmpty()) {
-            name = "(no instance id)";
+            name = qSL("(no instance id)");
         } else {
             name.chop(1); // remove the '-' separator
-            name = '"' % name % '"';
+            name = u'"' % name % u'"';
         }
-        fprintf(stdout, "%s\n", name.constData());
+        fprintf(stdout, "%s\n", name.toLocal8Bit().constData());
     }
     qApp->quit();
 }
-- 
cgit v1.2.3