remove support for legacy uic3 from designer component

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/src/designer/shared/codedialog.cpp b/src/designer/shared/codedialog.cpp
index 6e82d78..56b58b8 100644 (file)
--- a/src/designer/shared/codedialog.cpp
+++ b/src/designer/shared/codedialog.cpp
@@ -188,7 +188,7 @@ bool CodeDialog::generateCode(const QDesignerFormWindowInterface *fw,
     tempFormFile.close();
     // Run uic
     QByteArray rc;
-    if (!runUIC(tempFormFileName, UIC_GenerateCode, rc, *errorMessage))
+    if (!runUIC(tempFormFileName, rc, *errorMessage))
         return false;
     *code = QString::fromUtf8(rc);
     return true;

diff --git a/src/designer/shared/qdesigner_utils.cpp b/src/designer/shared/qdesigner_utils.cpp
index 5588c3f..6fe7abb 100644 (file)
--- a/src/designer/shared/qdesigner_utils.cpp
+++ b/src/designer/shared/qdesigner_utils.cpp
@@ -775,20 +775,12 @@ namespace qdesigner_internal
         return action;
     }
 
-    QDESIGNER_SHARED_EXPORT bool runUIC(const QString &fileName, UIC_Mode mode, QByteArray& ba, QString &errorMessage)
+    QDESIGNER_SHARED_EXPORT bool runUIC(const QString &fileName, QByteArray& ba, QString &errorMessage)
     {
         QStringList argv;
         QString binary = QLibraryInfo::location(QLibraryInfo::BinariesPath);
         binary += QDir::separator();
-        switch (mode) {
-        case UIC_GenerateCode:
-            binary += QLatin1String("uic");
-            break;
-        case UIC_ConvertV3:
-            binary += QLatin1String("uic3");
-            argv += QLatin1String("-convert");
-            break;
-        }
+        binary += QLatin1String("uic");
         argv += fileName;
         QProcess uic;
         uic.start(binary, argv);

diff --git a/src/designer/shared/qdesigner_utils_p.h b/src/designer/shared/qdesigner_utils_p.h
index 6454166..a38c720 100644 (file)
--- a/src/designer/shared/qdesigner_utils_p.h
+++ b/src/designer/shared/qdesigner_utils_p.h
@@ -424,8 +424,7 @@ QDESIGNER_SHARED_EXPORT QDesignerFormWindowCommand *createTextPropertyCommand(co
 QDESIGNER_SHARED_EXPORT QAction *preferredEditAction(QDesignerFormEditorInterface *core, QWidget *managedWidget);
 
 // Convenience to run UIC
-enum UIC_Mode { UIC_GenerateCode, UIC_ConvertV3 };
-QDESIGNER_SHARED_EXPORT bool runUIC(const QString &fileName, UIC_Mode mode, QByteArray& ba, QString &errorMessage);
+QDESIGNER_SHARED_EXPORT bool runUIC(const QString &fileName, QByteArray& ba, QString &errorMessage);
 
 // Find a suitable variable name for a class.
 QDESIGNER_SHARED_EXPORT QString qtify(const QString &name);