Changeset 561 for trunk/src/testlib/qtest.h

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/testlib/qtest.h (modified) (9 diffs)

trunk/src/testlib/qtest.h

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the QtTest module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -54 +54 @@
 #include <QtCore/qdatetime.h>
 #include <QtCore/qobject.h>
+
 #include <QtCore/qurl.h>
 
@@ -88 +89 @@
 {
     return time.isValid()
-        ? qstrdup(time.toString(QLatin1String("hh:mm:ss.zzz")).toLatin1())
+        ? qstrdup(time.toString(QLatin1String("hh:mm:ss.zzz")).toLatin1())
         : qstrdup("Invalid QTime");
 }
@@ -95 +96 @@
 {
     return date.isValid()
-        ? qstrdup(date.toString(QLatin1String("yyyy/MM/dd")).toLatin1())
+        ? qstrdup(date.toString(QLatin1String("yyyy/MM/dd")).toLatin1())
         : qstrdup("Invalid QDate");
 }
@@ -103 +104 @@
     return dateTime.isValid()
         ? qstrdup((dateTime.toString(QLatin1String("yyyy/MM/dd hh:mm:ss.zzz")) +
-                  (dateTime.timeSpec() == Qt::LocalTime ? QLatin1String("[local time]") : QLatin1String("[UTC]"))).toLatin1())
+                  (dateTime.timeSpec() == Qt::LocalTime ? QLatin1String("[local time]") : QLatin1String("[UTC]"))).toLatin1())
         : qstrdup("Invalid QDateTime");
 }
@@ -145 +146 @@
 {
     return qstrdup(uri.toEncoded().constData());
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }
 
@@ -227 +252 @@
 #include <QtTest/qtest_gui.h>
 
+
+
+
+
+
+
 #define QTEST_MAIN(TestObject) \
 int main(int argc, char *argv[]) \
 { \
     QApplication app(argc, argv); \
+
     TestObject tc; \
     return QTest::qExec(&tc, argc, argv); \