Changeset 651 for trunk/src/tools/uic3/main.cpp

Timestamp:

Mar 8, 2010, 12:52:58 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.2 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/tools/uic3/main.cpp (modified) (7 diffs)

trunk/src/tools/uic3/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -79 +79 @@
     const char* projectName = 0;
     const char* trmacro = 0;
-    bool nofwd = false;
     bool fix = false;
     bool deps = false;
-    bool implicitIncludes = true;
+    ;
     QByteArray pchFile;
-
 
     QApplication app(argc, argv, false);
@@ -147 +145 @@
                 deps = true;
             } else if (opt == "no-implicit-includes") {
-                implicitIncludes = false;
+                ;
             } else if (opt == "nofwd") {
-                nofwd = true;
+                readerOptions &= ~Ui3Reader::CustomWidgetForwardDeclarations;
+            } else if (opt == "layout-names") {
+                readerOptions |= Ui3Reader::PreserveLayoutNames;
             } else if (opt == "nounload") {
                 // skip
@@ -254 +254 @@
                  "\t-pch file          Add #include \"file\" as the first statement in implementation\n"
                  "\t-nofwd             Omit forward declarations of custom classes\n"
+
                  "\t-no-implicit-includes Do not generate #include-directives for custom classes\n"
                  "\t-nounload          Do not unload plugins after processing\n"
@@ -290 +291 @@
     QTextStream out(&fileOut);
 
-    Ui3Reader ui3(out);
+    Ui3Reader ui3(out);
     ui3.setExtractImages(extract, qrcOutputFile);
-
     if (projectName && imagecollection) {
         out.setEncoding(QTextStream::Latin1);
@@ -350 +350 @@
         return 0;
     } else if (convert) {
-        ui3.generateUi4(QFile::decodeName(fileName), QFile::decodeName(outputFile), doc, implicitIncludes);
+        ui3.generateUi4(QFile::decodeName(fileName), QFile::decodeName(outputFile), doc);
         return 0;
     }
@@ -389 +389 @@
         QString::fromUtf8(trmacro),
         QString::fromUtf8(className),
-        nofwd,
-        implicitIncludes, 
         convertedUi);