Changeset 561 for trunk/src/testlib/3rdparty

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/3rdparty/cycle_p.h (modified) (3 diffs)

trunk/src/testlib/3rdparty/cycle_p.h

@@ -191 +191 @@
 
 /* Visual C++ -- thanks to Morten Nissov for his help with this */
+
 #if _MSC_VER >= 1200 && (_M_IX86 >= 500 || (defined(_WIN32_WCE) && defined(_X86_))) && !defined(HAVE_TICK_COUNTER)
 #include <windows.h>
@@ -216 +217 @@
 #define TIME_MIN 5000.0   /* unreliable pentium IV cycle counter */
 #endif
+
 
 #if _MSC_VER >= 1400 && defined(_WIN32_WCE) && !defined(HAVE_TICK_COUNTER)
@@ -492 +494 @@
 #endif
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 #endif // QBENCHLIB_CYCLE_H