1 files changed, 8 insertions, 8 deletions
diff --git a/src/tools/uic/cpp/cppwritedeclaration.cpp b/src/tools/uic/cpp/cppwritedeclaration.cpp
index 2730ef9797..8261963cfa 100644
--- a/src/tools/uic/cpp/cppwritedeclaration.cpp
+++ b/src/tools/uic/cpp/cppwritedeclaration.cpp
@@ -55,7 +55,7 @@ void WriteDeclaration::acceptUI(DomUI *node)
         exportMacro.append(u' ');
 
     QStringList namespaceList = qualifiedClassName.split("::"_L1);
-    if (namespaceList.count()) {
+    if (namespaceList.size()) {
         className = namespaceList.last();
         namespaceList.removeLast();
     }
@@ -65,15 +65,15 @@ void WriteDeclaration::acceptUI(DomUI *node)
     // is a User using Qt-in-namespace having his own classes not in a namespace.
     // In this case the generated Ui helper classes will also end up in
     // the Qt namespace (which is harmless, but not "pretty")
-    const bool needsMacro = namespaceList.count() == 0
-        || namespaceList[0] == "qdesigner_internal"_L1;
+    const bool needsMacro = m_option.qtNamespace &&
+            (namespaceList.size() == 0 || namespaceList[0] == "qdesigner_internal"_L1);
 
     if (needsMacro)
         m_output << "QT_BEGIN_NAMESPACE\n\n";
 
     openNameSpaces(namespaceList, m_output);
 
-    if (namespaceList.count())
+    if (namespaceList.size())
         m_output << "\n";
 
     m_output << "class " << exportMacro << m_option.prefix << className << "\n"
@@ -98,7 +98,7 @@ void WriteDeclaration::acceptUI(DomUI *node)
 
     closeNameSpaces(namespaceList, m_output);
 
-    if (namespaceList.count())
+    if (namespaceList.size())
         m_output << "\n";
 
     if (m_option.generateNamespace && !m_option.prefix.isEmpty()) {
@@ -110,7 +110,7 @@ void WriteDeclaration::acceptUI(DomUI *node)
 
         closeNameSpaces(namespaceList, m_output);
 
-        if (namespaceList.count())
+        if (namespaceList.size())
             m_output << "\n";
     }
 
@@ -120,7 +120,7 @@ void WriteDeclaration::acceptUI(DomUI *node)
 
 void WriteDeclaration::acceptWidget(DomWidget *node)
 {
-    QString className = "QWidget"_L1;
+    QString className = u"QWidget"_s;
     if (node->hasAttributeClass())
         className = node->attributeClass();
 
@@ -137,7 +137,7 @@ void WriteDeclaration::acceptSpacer(DomSpacer *node)
 
 void WriteDeclaration::acceptLayout(DomLayout *node)
 {
-    QString className = "QLayout"_L1;
+    QString className = u"QLayout"_s;
     if (node->hasAttributeClass())
         className = node->attributeClass();