Changeset 769 for trunk/src/testlib/qtestcase.cpp

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/testlib/qtestcase.cpp (modified) (3 diffs)

trunk/src/testlib/qtestcase.cpp

@@ -965 +965 @@
          " -xml       : Outputs results as XML document\n"
          " -lightxml  : Outputs results as stream of XML tags\n"
-         " -flush     : Flushes the resutls\n"
+         " -flush     : Flushes the resus\n"
          " -o filename: Writes all output into a file\n"
          " -silent    : Only outputs warnings and failures\n"
@@ -1114 +1114 @@
         } else if (strcmp(argv[i], "-qws") == 0) {
             // do nothing
+
+
+
+
+
+
+
+
         } else if (argv[i][0] == '-') {
             printf("Unknown option: '%s'\n\n%s", argv[i], testOptions);
@@ -1299 +1307 @@
             QTestResult::setSkipCurrentTest(false);
 
+
+
+
+
+
+
+
+
+
+
+
+
             /* For each entry in the data table, do: */
             do {
                 if (!data || !qstrcmp(data, table.testData(curDataIndex)->dataTag())) {
                     foundFunction = true;
-                    QTestDataSetter s(table.isEmpty() ? static_cast<QTestData *>(0)
+                    QTestDataSetter s( ? static_cast<QTestData *>(0)
                                                       : table.testData(curDataIndex));